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