9.4.patch 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259
  1. --- opt/SageMath/local/lib/python3.9/site-packages/sage/combinat/posets/poset_examples.py.bu 2021-08-22 19:12:42.000000000 +1000
  2. +++ opt/SageMath/local/lib/python3.9/site-packages/sage/combinat/posets/poset_examples.py 2022-01-02 13:10:42.447658457 +1100
  3. @@ -155,7 +155,7 @@
  4. @staticmethod
  5. def BooleanLattice(n, facade=None, use_subsets=False):
  6. - """
  7. + r"""
  8. Return the Boolean lattice containing `2^n` elements.
  9. - ``n`` -- integer; number of elements will be `2^n`
  10. --- opt/SageMath/local/lib/python3.9/site-packages/traitlets/config/loader.py.bu 2021-08-22 22:00:01.000000000 +1000
  11. +++ opt/SageMath/local/lib/python3.9/site-packages/traitlets/config/loader.py 2022-01-11 11:39:00.600018177 +1100
  12. @@ -792,7 +792,7 @@
  13. nargs = '?'
  14. else:
  15. nargs = None
  16. - if len(key) is 1:
  17. + if len(key) == 1:
  18. paa('-'+key, '--'+key, type=text_type, dest=value, nargs=nargs)
  19. else:
  20. paa('--'+key, type=text_type, dest=value, nargs=nargs)
  21. @@ -801,7 +801,7 @@
  22. #
  23. self.alias_flags[self.aliases[key]] = value
  24. continue
  25. - if len(key) is 1:
  26. + if len(key) == 1:
  27. paa('-'+key, '--'+key, action='append_const', dest='_flags', const=value)
  28. else:
  29. paa('--'+key, action='append_const', dest='_flags', const=value)
  30. --- opt/SageMath/local/lib/python3.9/site-packages/psutil/_pslinux.py.bu 2021-08-22 21:58:18.000000000 +1000
  31. +++ opt/SageMath/local/lib/python3.9/site-packages/psutil/_pslinux.py 2022-01-11 12:14:46.007349527 +1100
  32. @@ -548,7 +548,7 @@
  33. # https://github.com/giampaolo/psutil/issues/200
  34. # try to parse /proc/stat as a last resort
  35. if num == 0:
  36. - search = re.compile('cpu\d')
  37. + search = re.compile(r'cpu\d')
  38. with open_text('%s/stat' % get_procfs_path()) as f:
  39. for line in f:
  40. line = line.split(' ')[0]
  41. @@ -1465,9 +1465,9 @@
  42. @wrap_exceptions
  43. def memory_full_info(
  44. self,
  45. - _private_re=re.compile(b"Private.*:\s+(\d+)"),
  46. - _pss_re=re.compile(b"Pss.*:\s+(\d+)"),
  47. - _swap_re=re.compile(b"Swap.*:\s+(\d+)")):
  48. + _private_re=re.compile(br"Private.*:\s+(\d+)"),
  49. + _pss_re=re.compile(br"Pss.*:\s+(\d+)"),
  50. + _swap_re=re.compile(br"Swap.*:\s+(\d+)")):
  51. basic_mem = self.memory_info()
  52. # Note: using 3 regexes is faster than reading the file
  53. # line by line.
  54. @@ -1580,7 +1580,7 @@
  55. raise
  56. @wrap_exceptions
  57. - def num_ctx_switches(self, _ctxsw_re=re.compile(b'ctxt_switches:\t(\d+)')):
  58. + def num_ctx_switches(self, _ctxsw_re=re.compile(br'ctxt_switches:\t(\d+)')):
  59. data = self._read_status_file()
  60. ctxsw = _ctxsw_re.findall(data)
  61. if not ctxsw:
  62. @@ -1593,7 +1593,7 @@
  63. return _common.pctxsw(int(ctxsw[0]), int(ctxsw[1]))
  64. @wrap_exceptions
  65. - def num_threads(self, _num_threads_re=re.compile(b'Threads:\t(\d+)')):
  66. + def num_threads(self, _num_threads_re=re.compile(br'Threads:\t(\d+)')):
  67. # Note: on Python 3 using a re is faster than iterating over file
  68. # line by line. On Python 2 is the exact opposite, and iterating
  69. # over a file on Python 3 is slower than on Python 2.
  70. @@ -1649,7 +1649,7 @@
  71. return cext.proc_cpu_affinity_get(self.pid)
  72. def _get_eligible_cpus(
  73. - self, _re=re.compile(b"Cpus_allowed_list:\t(\d+)-(\d+)")):
  74. + self, _re=re.compile(br"Cpus_allowed_list:\t(\d+)-(\d+)")):
  75. # See: https://github.com/giampaolo/psutil/issues/956
  76. data = self._read_status_file()
  77. match = _re.findall(data)
  78. @@ -1811,13 +1811,13 @@
  79. return int(self._parse_stat_file()[2])
  80. @wrap_exceptions
  81. - def uids(self, _uids_re=re.compile(b'Uid:\t(\d+)\t(\d+)\t(\d+)')):
  82. + def uids(self, _uids_re=re.compile(br'Uid:\t(\d+)\t(\d+)\t(\d+)')):
  83. data = self._read_status_file()
  84. real, effective, saved = _uids_re.findall(data)[0]
  85. return _common.puids(int(real), int(effective), int(saved))
  86. @wrap_exceptions
  87. - def gids(self, _gids_re=re.compile(b'Gid:\t(\d+)\t(\d+)\t(\d+)')):
  88. + def gids(self, _gids_re=re.compile(br'Gid:\t(\d+)\t(\d+)\t(\d+)')):
  89. data = self._read_status_file()
  90. real, effective, saved = _gids_re.findall(data)[0]
  91. return _common.pgids(int(real), int(effective), int(saved))
  92. ./opt/SageMath/local/lib/python3.9/site-packages/sage/symbolic/RCS
  93. diff -u -r1.1 expression_conversions.py
  94. --- opt/SageMath/local/lib/python3.9/site-packages/sage/symbolic/expression_conversions.py 2021/08/22 09:12:43 1.1
  95. +++ opt/SageMath/local/lib/python3.9/site-packages/sage/symbolic/expression_conversions.py 2022/01/28 02:07:09
  96. @@ -969,7 +969,7 @@
  97. super(FriCASConverter, self).__init__(sage.interfaces.fricas.fricas)
  98. def pyobject(self, ex, obj):
  99. - """
  100. + r"""
  101. Return a string which, when evaluated by FriCAS, returns the
  102. object as an expression.
  103. ./opt/SageMath/local/lib/python3.9/site-packages/IPython/core/RCS
  104. diff -u -r1.1 oinspect.py
  105. ./opt/SageMath/local/lib/python3.9/site-packages/requests/RCS
  106. diff -u -r1.1 api.py
  107. --- opt/SageMath/local/lib/python3.9/site-packages/requests/api.py 2021/08/22 11:52:24 1.1
  108. +++ opt/SageMath/local/lib/python3.9/site-packages/requests/api.py 2022/01/28 00:49:42
  109. @@ -57,7 +57,7 @@
  110. def get(url, params=None, **kwargs):
  111. - """Sends a GET request.
  112. + r"""Sends a GET request.
  113. :param url: URL for the new :class:`Request` object.
  114. :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
  115. @@ -71,7 +71,7 @@
  116. def options(url, **kwargs):
  117. - """Sends a OPTIONS request.
  118. + r"""Sends a OPTIONS request.
  119. :param url: URL for the new :class:`Request` object.
  120. :param \*\*kwargs: Optional arguments that ``request`` takes.
  121. @@ -84,7 +84,7 @@
  122. def head(url, **kwargs):
  123. - """Sends a HEAD request.
  124. + r"""Sends a HEAD request.
  125. :param url: URL for the new :class:`Request` object.
  126. :param \*\*kwargs: Optional arguments that ``request`` takes.
  127. @@ -97,7 +97,7 @@
  128. def post(url, data=None, json=None, **kwargs):
  129. - """Sends a POST request.
  130. + r"""Sends a POST request.
  131. :param url: URL for the new :class:`Request` object.
  132. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  133. @@ -111,7 +111,7 @@
  134. def put(url, data=None, **kwargs):
  135. - """Sends a PUT request.
  136. + r"""Sends a PUT request.
  137. :param url: URL for the new :class:`Request` object.
  138. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  139. @@ -125,7 +125,7 @@
  140. def patch(url, data=None, **kwargs):
  141. - """Sends a PATCH request.
  142. + r"""Sends a PATCH request.
  143. :param url: URL for the new :class:`Request` object.
  144. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  145. @@ -139,7 +139,7 @@
  146. def delete(url, **kwargs):
  147. - """Sends a DELETE request.
  148. + r"""Sends a DELETE request.
  149. :param url: URL for the new :class:`Request` object.
  150. :param \*\*kwargs: Optional arguments that ``request`` takes.
  151. diff -u -r1.1 models.py
  152. --- opt/SageMath/local/lib/python3.9/site-packages/requests/models.py 2021/08/22 11:52:24 1.1
  153. +++ opt/SageMath/local/lib/python3.9/site-packages/requests/models.py 2022/01/28 00:45:51
  154. @@ -840,7 +840,7 @@
  155. return content
  156. def json(self, **kwargs):
  157. - """Returns the json-encoded content of a response, if any.
  158. + r"""Returns the json-encoded content of a response, if any.
  159. :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
  160. :raises ValueError: If the response body does not contain valid json.
  161. diff -u -r1.1 sessions.py
  162. --- opt/SageMath/local/lib/python3.9/site-packages/requests/sessions.py 2021/08/22 11:52:24 1.1
  163. +++ opt/SageMath/local/lib/python3.9/site-packages/requests/sessions.py 2022/01/28 01:00:24
  164. @@ -490,7 +490,7 @@
  165. return resp
  166. def get(self, url, **kwargs):
  167. - """Sends a GET request. Returns :class:`Response` object.
  168. + r"""Sends a GET request. Returns :class:`Response` object.
  169. :param url: URL for the new :class:`Request` object.
  170. :param \*\*kwargs: Optional arguments that ``request`` takes.
  171. @@ -501,7 +501,7 @@
  172. return self.request('GET', url, **kwargs)
  173. def options(self, url, **kwargs):
  174. - """Sends a OPTIONS request. Returns :class:`Response` object.
  175. + r"""Sends a OPTIONS request. Returns :class:`Response` object.
  176. :param url: URL for the new :class:`Request` object.
  177. :param \*\*kwargs: Optional arguments that ``request`` takes.
  178. @@ -512,7 +512,7 @@
  179. return self.request('OPTIONS', url, **kwargs)
  180. def head(self, url, **kwargs):
  181. - """Sends a HEAD request. Returns :class:`Response` object.
  182. + r"""Sends a HEAD request. Returns :class:`Response` object.
  183. :param url: URL for the new :class:`Request` object.
  184. :param \*\*kwargs: Optional arguments that ``request`` takes.
  185. @@ -523,7 +523,7 @@
  186. return self.request('HEAD', url, **kwargs)
  187. def post(self, url, data=None, json=None, **kwargs):
  188. - """Sends a POST request. Returns :class:`Response` object.
  189. + r"""Sends a POST request. Returns :class:`Response` object.
  190. :param url: URL for the new :class:`Request` object.
  191. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  192. @@ -535,7 +535,7 @@
  193. return self.request('POST', url, data=data, json=json, **kwargs)
  194. def put(self, url, data=None, **kwargs):
  195. - """Sends a PUT request. Returns :class:`Response` object.
  196. + r"""Sends a PUT request. Returns :class:`Response` object.
  197. :param url: URL for the new :class:`Request` object.
  198. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  199. @@ -546,7 +546,7 @@
  200. return self.request('PUT', url, data=data, **kwargs)
  201. def patch(self, url, data=None, **kwargs):
  202. - """Sends a PATCH request. Returns :class:`Response` object.
  203. + r"""Sends a PATCH request. Returns :class:`Response` object.
  204. :param url: URL for the new :class:`Request` object.
  205. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
  206. @@ -557,7 +557,7 @@
  207. return self.request('PATCH', url, data=data, **kwargs)
  208. def delete(self, url, **kwargs):
  209. - """Sends a DELETE request. Returns :class:`Response` object.
  210. + r"""Sends a DELETE request. Returns :class:`Response` object.
  211. :param url: URL for the new :class:`Request` object.
  212. :param \*\*kwargs: Optional arguments that ``request`` takes.