[Python-checkins] cpython (merge 3.5 -> default): Issue #27039: Fixed bytearray.remove() for values greater than 127.
serhiy.storchaka
python-checkins at python.org
Mon May 16 15:24:37 EDT 2016
https://hg.python.org/cpython/rev/3eb502d43616
changeset: 101379:3eb502d43616
parent: 101376:f771a847b748
parent: 101377:10444778d41c
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon May 16 22:24:03 2016 +0300
summary:
Issue #27039: Fixed bytearray.remove() for values greater than 127.
Based on patch by Joe Jevnik.
files:
Lib/test/test_bytes.py | 7 +
Misc/NEWS | 3 +
Objects/bytearrayobject.c | 7 +-
Python/importlib_external.h | 206 ++++++++++++------------
4 files changed, 115 insertions(+), 108 deletions(-)
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1177,6 +1177,13 @@
b.remove(Indexable(ord('e')))
self.assertEqual(b, b'')
+ # test values outside of the ascii range: (0, 127)
+ c = bytearray([126, 127, 128, 129])
+ c.remove(127)
+ self.assertEqual(c, bytes([126, 128, 129]))
+ c.remove(129)
+ self.assertEqual(c, bytes([126, 128]))
+
def test_pop(self):
b = bytearray(b'world')
self.assertEqual(b.pop(), ord('d'))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #27039: Fixed bytearray.remove() for values greater than 127. Based on
+ patch by Joe Jevnik.
+
- Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
- Issue #27005: Optimized the float.fromhex() class method for exact float.
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -1734,11 +1734,8 @@
Py_ssize_t where, n = Py_SIZE(self);
char *buf = PyByteArray_AS_STRING(self);
- for (where = 0; where < n; where++) {
- if (buf[where] == value)
- break;
- }
- if (where == n) {
+ where = stringlib_find_char(buf, n, value);
+ if (where < 0) {
PyErr_SetString(PyExc_ValueError, "value not found in bytearray");
return NULL;
}
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -368,7 +368,7 @@
103,90,15,97,108,109,111,115,116,95,102,105,108,101,110,97,
109,101,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
0,218,17,99,97,99,104,101,95,102,114,111,109,95,115,111,
- 117,114,99,101,245,0,0,0,115,46,0,0,0,0,18,12,
+ 117,114,99,101,248,0,0,0,115,46,0,0,0,0,18,12,
1,9,1,7,1,12,1,6,1,12,1,18,1,18,1,24,
1,12,1,12,1,12,1,36,1,12,1,18,1,9,2,12,
1,12,1,12,1,12,1,21,1,21,1,114,79,0,0,0,
@@ -447,7 +447,7 @@
101,118,101,108,90,13,98,97,115,101,95,102,105,108,101,110,
97,109,101,114,4,0,0,0,114,4,0,0,0,114,5,0,
0,0,218,17,115,111,117,114,99,101,95,102,114,111,109,95,
- 99,97,99,104,101,33,1,0,0,115,44,0,0,0,0,9,
+ 99,97,99,104,101,36,1,0,0,115,44,0,0,0,0,9,
18,1,12,1,18,1,18,1,12,1,9,1,15,1,15,1,
12,1,9,1,15,1,12,1,22,1,15,1,9,1,12,1,
22,1,12,1,9,1,12,1,19,1,114,85,0,0,0,99,
@@ -484,7 +484,7 @@
0,0,114,36,0,0,0,90,9,101,120,116,101,110,115,105,
111,110,218,11,115,111,117,114,99,101,95,112,97,116,104,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,15,
- 95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,66,
+ 95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,69,
1,0,0,115,20,0,0,0,0,7,18,1,4,1,24,1,
35,1,4,1,3,1,16,1,19,1,21,1,114,91,0,0,
0,99,1,0,0,0,0,0,0,0,1,0,0,0,11,0,
@@ -499,7 +499,7 @@
0,0,114,79,0,0,0,114,66,0,0,0,114,74,0,0,
0,41,1,218,8,102,105,108,101,110,97,109,101,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,218,11,95,103,
- 101,116,95,99,97,99,104,101,100,85,1,0,0,115,16,0,
+ 101,116,95,99,97,99,104,101,100,88,1,0,0,115,16,0,
0,0,0,1,21,1,3,1,14,1,13,1,8,1,21,1,
4,2,114,95,0,0,0,99,1,0,0,0,0,0,0,0,
2,0,0,0,11,0,0,0,67,0,0,0,115,60,0,0,
@@ -514,7 +514,7 @@
114,39,0,0,0,114,41,0,0,0,114,40,0,0,0,41,
2,114,35,0,0,0,114,42,0,0,0,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,10,95,99,97,108,
- 99,95,109,111,100,101,97,1,0,0,115,12,0,0,0,0,
+ 99,95,109,111,100,101,100,1,0,0,115,12,0,0,0,0,
2,3,1,19,1,13,1,11,3,10,1,114,97,0,0,0,
99,1,0,0,0,0,0,0,0,3,0,0,0,11,0,0,
0,3,0,0,0,115,84,0,0,0,100,1,0,135,0,0,
@@ -554,7 +554,7 @@
103,115,90,6,107,119,97,114,103,115,41,1,218,6,109,101,
116,104,111,100,114,4,0,0,0,114,5,0,0,0,218,19,
95,99,104,101,99,107,95,110,97,109,101,95,119,114,97,112,
- 112,101,114,117,1,0,0,115,12,0,0,0,0,1,12,1,
+ 112,101,114,120,1,0,0,115,12,0,0,0,0,1,12,1,
12,1,15,1,6,1,25,1,122,40,95,99,104,101,99,107,
95,110,97,109,101,46,60,108,111,99,97,108,115,62,46,95,
99,104,101,99,107,95,110,97,109,101,95,119,114,97,112,112,
@@ -573,7 +573,7 @@
116,97,116,116,114,218,8,95,95,100,105,99,116,95,95,218,
6,117,112,100,97,116,101,41,3,90,3,110,101,119,90,3,
111,108,100,114,52,0,0,0,114,4,0,0,0,114,4,0,
- 0,0,114,5,0,0,0,218,5,95,119,114,97,112,128,1,
+ 0,0,114,5,0,0,0,218,5,95,119,114,97,112,131,1,
0,0,115,8,0,0,0,0,1,25,1,15,1,29,1,122,
26,95,99,104,101,99,107,95,110,97,109,101,46,60,108,111,
99,97,108,115,62,46,95,119,114,97,112,41,3,218,10,95,
@@ -581,7 +581,7 @@
78,97,109,101,69,114,114,111,114,41,3,114,102,0,0,0,
114,103,0,0,0,114,113,0,0,0,114,4,0,0,0,41,
1,114,102,0,0,0,114,5,0,0,0,218,11,95,99,104,
- 101,99,107,95,110,97,109,101,109,1,0,0,115,14,0,0,
+ 101,99,107,95,110,97,109,101,112,1,0,0,115,14,0,0,
0,0,8,21,7,3,1,13,1,13,2,17,5,13,1,114,
116,0,0,0,99,2,0,0,0,0,0,0,0,5,0,0,
0,4,0,0,0,67,0,0,0,115,84,0,0,0,124,0,
@@ -611,7 +611,7 @@
218,8,112,111,114,116,105,111,110,115,218,3,109,115,103,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,17,
95,102,105,110,100,95,109,111,100,117,108,101,95,115,104,105,
- 109,137,1,0,0,115,10,0,0,0,0,10,21,1,24,1,
+ 109,140,1,0,0,115,10,0,0,0,0,10,21,1,24,1,
6,1,29,1,114,123,0,0,0,99,4,0,0,0,0,0,
0,0,11,0,0,0,19,0,0,0,67,0,0,0,115,252,
1,0,0,105,0,0,125,4,0,124,2,0,100,1,0,107,
@@ -698,7 +698,7 @@
218,11,115,111,117,114,99,101,95,115,105,122,101,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,218,25,95,118,
97,108,105,100,97,116,101,95,98,121,116,101,99,111,100,101,
- 95,104,101,97,100,101,114,154,1,0,0,115,76,0,0,0,
+ 95,104,101,97,100,101,114,157,1,0,0,115,76,0,0,0,
0,11,6,1,12,1,13,3,6,1,12,1,10,1,16,1,
16,1,16,1,12,1,18,1,16,1,18,1,18,1,15,1,
16,1,15,1,18,1,15,1,16,1,12,1,12,1,3,1,
@@ -729,7 +729,7 @@
5,114,53,0,0,0,114,98,0,0,0,114,89,0,0,0,
114,90,0,0,0,218,4,99,111,100,101,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,17,95,99,111,109,
- 112,105,108,101,95,98,121,116,101,99,111,100,101,209,1,0,
+ 112,105,108,101,95,98,121,116,101,99,111,100,101,212,1,0,
0,115,16,0,0,0,0,2,15,1,15,1,16,1,12,1,
16,1,4,2,18,1,114,141,0,0,0,114,59,0,0,0,
99,3,0,0,0,0,0,0,0,4,0,0,0,3,0,0,
@@ -749,7 +749,7 @@
100,117,109,112,115,41,4,114,140,0,0,0,114,126,0,0,
0,114,134,0,0,0,114,53,0,0,0,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,17,95,99,111,100,
- 101,95,116,111,95,98,121,116,101,99,111,100,101,221,1,0,
+ 101,95,116,111,95,98,121,116,101,99,111,100,101,224,1,0,
0,115,10,0,0,0,0,3,12,1,19,1,19,1,22,1,
114,144,0,0,0,99,1,0,0,0,0,0,0,0,5,0,
0,0,4,0,0,0,67,0,0,0,115,89,0,0,0,100,
@@ -778,7 +778,7 @@
218,8,101,110,99,111,100,105,110,103,90,15,110,101,119,108,
105,110,101,95,100,101,99,111,100,101,114,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,13,100,101,99,111,
- 100,101,95,115,111,117,114,99,101,231,1,0,0,115,10,0,
+ 100,101,95,115,111,117,114,99,101,234,1,0,0,115,10,0,
0,0,0,5,12,1,18,1,15,1,18,1,114,149,0,0,
0,114,120,0,0,0,218,26,115,117,98,109,111,100,117,108,
101,95,115,101,97,114,99,104,95,108,111,99,97,116,105,111,
@@ -843,7 +843,7 @@
102,105,120,101,115,114,153,0,0,0,90,7,100,105,114,110,
97,109,101,114,4,0,0,0,114,4,0,0,0,114,5,0,
0,0,218,23,115,112,101,99,95,102,114,111,109,95,102,105,
- 108,101,95,108,111,99,97,116,105,111,110,248,1,0,0,115,
+ 108,101,95,108,111,99,97,116,105,111,110,251,1,0,0,115,
60,0,0,0,0,12,12,4,6,1,15,2,3,1,19,1,
13,1,5,8,24,1,9,3,12,1,22,1,21,1,15,1,
9,1,5,2,4,3,12,2,15,1,3,1,19,1,13,1,
@@ -883,7 +883,7 @@
72,75,69,89,95,76,79,67,65,76,95,77,65,67,72,73,
78,69,41,2,218,3,99,108,115,218,3,107,101,121,114,4,
0,0,0,114,4,0,0,0,114,5,0,0,0,218,14,95,
- 111,112,101,110,95,114,101,103,105,115,116,114,121,70,2,0,
+ 111,112,101,110,95,114,101,103,105,115,116,114,121,73,2,0,
0,115,8,0,0,0,0,2,3,1,23,1,13,1,122,36,
87,105,110,100,111,119,115,82,101,103,105,115,116,114,121,70,
105,110,100,101,114,46,95,111,112,101,110,95,114,101,103,105,
@@ -911,7 +911,7 @@
121,95,107,101,121,114,165,0,0,0,90,4,104,107,101,121,
218,8,102,105,108,101,112,97,116,104,114,4,0,0,0,114,
4,0,0,0,114,5,0,0,0,218,16,95,115,101,97,114,
- 99,104,95,114,101,103,105,115,116,114,121,77,2,0,0,115,
+ 99,104,95,114,101,103,105,115,116,114,121,80,2,0,0,115,
22,0,0,0,0,2,9,1,12,2,9,1,15,1,26,1,
3,1,18,1,29,1,13,1,9,1,122,38,87,105,110,100,
111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,101,
@@ -936,7 +936,7 @@
103,101,116,114,171,0,0,0,114,120,0,0,0,114,160,0,
0,0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,
0,114,5,0,0,0,218,9,102,105,110,100,95,115,112,101,
- 99,92,2,0,0,115,26,0,0,0,0,2,15,1,12,1,
+ 99,95,2,0,0,115,26,0,0,0,0,2,15,1,12,1,
4,1,3,1,14,1,13,1,9,1,22,1,21,1,9,1,
15,1,9,1,122,31,87,105,110,100,111,119,115,82,101,103,
105,115,116,114,121,70,105,110,100,101,114,46,102,105,110,100,
@@ -955,7 +955,7 @@
175,0,0,0,114,120,0,0,0,41,4,114,164,0,0,0,
114,119,0,0,0,114,35,0,0,0,114,158,0,0,0,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,11,
- 102,105,110,100,95,109,111,100,117,108,101,108,2,0,0,115,
+ 102,105,110,100,95,109,111,100,117,108,101,111,2,0,0,115,
8,0,0,0,0,7,18,1,12,1,7,2,122,33,87,105,
110,100,111,119,115,82,101,103,105,115,116,114,121,70,105,110,
100,101,114,46,102,105,110,100,95,109,111,100,117,108,101,41,
@@ -964,7 +964,7 @@
167,0,0,0,218,11,99,108,97,115,115,109,101,116,104,111,
100,114,166,0,0,0,114,172,0,0,0,114,175,0,0,0,
114,176,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,162,0,0,0,58,2,
+ 4,0,0,0,114,5,0,0,0,114,162,0,0,0,61,2,
0,0,115,20,0,0,0,12,2,6,3,6,3,6,2,6,
2,18,7,18,15,3,1,21,15,3,1,114,162,0,0,0,
99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
@@ -1002,7 +1002,7 @@
100,0,0,0,114,119,0,0,0,114,94,0,0,0,90,13,
102,105,108,101,110,97,109,101,95,98,97,115,101,90,9,116,
97,105,108,95,110,97,109,101,114,4,0,0,0,114,4,0,
- 0,0,114,5,0,0,0,114,153,0,0,0,127,2,0,0,
+ 0,0,114,5,0,0,0,114,153,0,0,0,130,2,0,0,
115,8,0,0,0,0,3,25,1,22,1,19,1,122,24,95,
76,111,97,100,101,114,66,97,115,105,99,115,46,105,115,95,
112,97,99,107,97,103,101,99,2,0,0,0,0,0,0,0,
@@ -1013,7 +1013,7 @@
111,110,46,78,114,4,0,0,0,41,2,114,100,0,0,0,
114,158,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
5,0,0,0,218,13,99,114,101,97,116,101,95,109,111,100,
- 117,108,101,135,2,0,0,115,0,0,0,0,122,27,95,76,
+ 117,108,101,138,2,0,0,115,0,0,0,0,122,27,95,76,
111,97,100,101,114,66,97,115,105,99,115,46,99,114,101,97,
116,101,95,109,111,100,117,108,101,99,2,0,0,0,0,0,
0,0,3,0,0,0,4,0,0,0,67,0,0,0,115,80,
@@ -1034,7 +1034,7 @@
101,99,114,111,0,0,0,41,3,114,100,0,0,0,218,6,
109,111,100,117,108,101,114,140,0,0,0,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,11,101,120,101,99,
- 95,109,111,100,117,108,101,138,2,0,0,115,10,0,0,0,
+ 95,109,111,100,117,108,101,141,2,0,0,115,10,0,0,0,
0,2,18,1,12,1,9,1,15,1,122,25,95,76,111,97,
100,101,114,66,97,115,105,99,115,46,101,120,101,99,95,109,
111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,0,
@@ -1045,14 +1045,14 @@
114,0,0,0,218,17,95,108,111,97,100,95,109,111,100,117,
108,101,95,115,104,105,109,41,2,114,100,0,0,0,114,119,
0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,
- 0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,146,
+ 0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,149,
2,0,0,115,2,0,0,0,0,2,122,25,95,76,111,97,
100,101,114,66,97,115,105,99,115,46,108,111,97,100,95,109,
111,100,117,108,101,78,41,8,114,105,0,0,0,114,104,0,
0,0,114,106,0,0,0,114,107,0,0,0,114,153,0,0,
0,114,180,0,0,0,114,185,0,0,0,114,187,0,0,0,
114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 5,0,0,0,114,178,0,0,0,122,2,0,0,115,10,0,
+ 5,0,0,0,114,178,0,0,0,125,2,0,0,115,10,0,
0,0,12,3,6,2,12,8,12,3,12,8,114,178,0,0,
0,99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,
0,0,64,0,0,0,115,106,0,0,0,101,0,0,90,1,
@@ -1080,7 +1080,7 @@
41,1,218,7,73,79,69,114,114,111,114,41,2,114,100,0,
0,0,114,35,0,0,0,114,4,0,0,0,114,4,0,0,
0,114,5,0,0,0,218,10,112,97,116,104,95,109,116,105,
- 109,101,153,2,0,0,115,2,0,0,0,0,6,122,23,83,
+ 109,101,156,2,0,0,115,2,0,0,0,0,6,122,23,83,
111,117,114,99,101,76,111,97,100,101,114,46,112,97,116,104,
95,109,116,105,109,101,99,2,0,0,0,0,0,0,0,2,
0,0,0,3,0,0,0,67,0,0,0,115,19,0,0,0,
@@ -1115,7 +1115,7 @@
32,32,32,32,114,126,0,0,0,41,1,114,190,0,0,0,
41,2,114,100,0,0,0,114,35,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,5,0,0,0,218,10,112,97,116,
- 104,95,115,116,97,116,115,161,2,0,0,115,2,0,0,0,
+ 104,95,115,116,97,116,115,164,2,0,0,115,2,0,0,0,
0,11,122,23,83,111,117,114,99,101,76,111,97,100,101,114,
46,112,97,116,104,95,115,116,97,116,115,99,4,0,0,0,
0,0,0,0,4,0,0,0,3,0,0,0,67,0,0,0,
@@ -1139,7 +1139,7 @@
114,90,0,0,0,90,10,99,97,99,104,101,95,112,97,116,
104,114,53,0,0,0,114,4,0,0,0,114,4,0,0,0,
114,5,0,0,0,218,15,95,99,97,99,104,101,95,98,121,
- 116,101,99,111,100,101,174,2,0,0,115,2,0,0,0,0,
+ 116,101,99,111,100,101,177,2,0,0,115,2,0,0,0,0,
8,122,28,83,111,117,114,99,101,76,111,97,100,101,114,46,
95,99,97,99,104,101,95,98,121,116,101,99,111,100,101,99,
3,0,0,0,0,0,0,0,3,0,0,0,1,0,0,0,
@@ -1156,7 +1156,7 @@
32,32,32,32,32,32,32,78,114,4,0,0,0,41,3,114,
100,0,0,0,114,35,0,0,0,114,53,0,0,0,114,4,
0,0,0,114,4,0,0,0,114,5,0,0,0,114,192,0,
- 0,0,184,2,0,0,115,0,0,0,0,122,21,83,111,117,
+ 0,0,187,2,0,0,115,0,0,0,0,122,21,83,111,117,
114,99,101,76,111,97,100,101,114,46,115,101,116,95,100,97,
116,97,99,2,0,0,0,0,0,0,0,5,0,0,0,16,
0,0,0,67,0,0,0,115,105,0,0,0,124,0,0,106,
@@ -1178,7 +1178,7 @@
0,0,0,114,119,0,0,0,114,35,0,0,0,114,147,0,
0,0,218,3,101,120,99,114,4,0,0,0,114,4,0,0,
0,114,5,0,0,0,218,10,103,101,116,95,115,111,117,114,
- 99,101,191,2,0,0,115,14,0,0,0,0,2,15,1,3,
+ 99,101,194,2,0,0,115,14,0,0,0,0,2,15,1,3,
1,19,1,18,1,9,1,31,1,122,23,83,111,117,114,99,
101,76,111,97,100,101,114,46,103,101,116,95,115,111,117,114,
99,101,218,9,95,111,112,116,105,109,105,122,101,114,29,0,
@@ -1200,7 +1200,7 @@
108,101,41,4,114,100,0,0,0,114,53,0,0,0,114,35,
0,0,0,114,197,0,0,0,114,4,0,0,0,114,4,0,
0,0,114,5,0,0,0,218,14,115,111,117,114,99,101,95,
- 116,111,95,99,111,100,101,201,2,0,0,115,4,0,0,0,
+ 116,111,95,99,111,100,101,204,2,0,0,115,4,0,0,0,
0,5,21,1,122,27,83,111,117,114,99,101,76,111,97,100,
101,114,46,115,111,117,114,99,101,95,116,111,95,99,111,100,
101,99,2,0,0,0,0,0,0,0,10,0,0,0,43,0,
@@ -1261,7 +1261,7 @@
89,0,0,0,218,2,115,116,114,53,0,0,0,218,10,98,
121,116,101,115,95,100,97,116,97,114,147,0,0,0,90,11,
99,111,100,101,95,111,98,106,101,99,116,114,4,0,0,0,
- 114,4,0,0,0,114,5,0,0,0,114,181,0,0,0,209,
+ 114,4,0,0,0,114,5,0,0,0,114,181,0,0,0,212,
2,0,0,115,78,0,0,0,0,7,15,1,6,1,3,1,
16,1,13,1,11,2,3,1,19,1,13,1,5,2,16,1,
3,1,19,1,13,1,5,2,3,1,9,1,12,1,13,1,
@@ -1274,7 +1274,7 @@
0,0,0,114,192,0,0,0,114,196,0,0,0,114,200,0,
0,0,114,181,0,0,0,114,4,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,5,0,0,0,114,188,0,0,0,
- 151,2,0,0,115,14,0,0,0,12,2,12,8,12,13,12,
+ 154,2,0,0,115,14,0,0,0,12,2,12,8,12,13,12,
10,12,7,12,10,18,8,114,188,0,0,0,99,0,0,0,
0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,
0,115,112,0,0,0,101,0,0,90,1,0,100,0,0,90,
@@ -1302,7 +1302,7 @@
32,32,32,32,32,102,105,110,100,101,114,46,78,41,2,114,
98,0,0,0,114,35,0,0,0,41,3,114,100,0,0,0,
114,119,0,0,0,114,35,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,179,0,0,0,10,3,
+ 4,0,0,0,114,5,0,0,0,114,179,0,0,0,13,3,
0,0,115,4,0,0,0,0,3,9,1,122,19,70,105,108,
101,76,111,97,100,101,114,46,95,95,105,110,105,116,95,95,
99,2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,
@@ -1312,7 +1312,7 @@
2,218,9,95,95,99,108,97,115,115,95,95,114,111,0,0,
0,41,2,114,100,0,0,0,218,5,111,116,104,101,114,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,6,
- 95,95,101,113,95,95,16,3,0,0,115,4,0,0,0,0,
+ 95,95,101,113,95,95,19,3,0,0,115,4,0,0,0,0,
1,18,1,122,17,70,105,108,101,76,111,97,100,101,114,46,
95,95,101,113,95,95,99,1,0,0,0,0,0,0,0,1,
0,0,0,3,0,0,0,67,0,0,0,115,26,0,0,0,
@@ -1320,7 +1320,7 @@
0,0,106,2,0,131,1,0,65,83,41,1,78,41,3,218,
4,104,97,115,104,114,98,0,0,0,114,35,0,0,0,41,
1,114,100,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,218,8,95,95,104,97,115,104,95,95,20,
+ 114,5,0,0,0,218,8,95,95,104,97,115,104,95,95,23,
3,0,0,115,2,0,0,0,0,1,122,19,70,105,108,101,
76,111,97,100,101,114,46,95,95,104,97,115,104,95,95,99,
2,0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,
@@ -1335,7 +1335,7 @@
32,32,32,32,32,32,32,41,3,218,5,115,117,112,101,114,
114,204,0,0,0,114,187,0,0,0,41,2,114,100,0,0,
0,114,119,0,0,0,41,1,114,205,0,0,0,114,4,0,
- 0,0,114,5,0,0,0,114,187,0,0,0,23,3,0,0,
+ 0,0,114,5,0,0,0,114,187,0,0,0,26,3,0,0,
115,2,0,0,0,0,10,122,22,70,105,108,101,76,111,97,
100,101,114,46,108,111,97,100,95,109,111,100,117,108,101,99,
2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,
@@ -1346,7 +1346,7 @@
98,121,32,116,104,101,32,102,105,110,100,101,114,46,41,1,
114,35,0,0,0,41,2,114,100,0,0,0,114,119,0,0,
0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,
- 114,151,0,0,0,35,3,0,0,115,2,0,0,0,0,3,
+ 114,151,0,0,0,38,3,0,0,115,2,0,0,0,0,3,
122,23,70,105,108,101,76,111,97,100,101,114,46,103,101,116,
95,102,105,108,101,110,97,109,101,99,2,0,0,0,0,0,
0,0,3,0,0,0,9,0,0,0,67,0,0,0,115,42,
@@ -1359,14 +1359,14 @@
0,0,0,114,50,0,0,0,90,4,114,101,97,100,41,3,
114,100,0,0,0,114,35,0,0,0,114,54,0,0,0,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,194,
- 0,0,0,40,3,0,0,115,4,0,0,0,0,2,21,1,
+ 0,0,0,43,3,0,0,115,4,0,0,0,0,2,21,1,
122,19,70,105,108,101,76,111,97,100,101,114,46,103,101,116,
95,100,97,116,97,41,11,114,105,0,0,0,114,104,0,0,
0,114,106,0,0,0,114,107,0,0,0,114,179,0,0,0,
114,207,0,0,0,114,209,0,0,0,114,116,0,0,0,114,
187,0,0,0,114,151,0,0,0,114,194,0,0,0,114,4,
0,0,0,114,4,0,0,0,41,1,114,205,0,0,0,114,
- 5,0,0,0,114,204,0,0,0,5,3,0,0,115,14,0,
+ 5,0,0,0,114,204,0,0,0,8,3,0,0,115,14,0,
0,0,12,3,6,2,12,6,12,4,12,3,24,12,18,5,
114,204,0,0,0,99,0,0,0,0,0,0,0,0,0,0,
0,0,4,0,0,0,64,0,0,0,115,64,0,0,0,101,
@@ -1389,7 +1389,7 @@
114,39,0,0,0,218,8,115,116,95,109,116,105,109,101,90,
7,115,116,95,115,105,122,101,41,3,114,100,0,0,0,114,
35,0,0,0,114,202,0,0,0,114,4,0,0,0,114,4,
- 0,0,0,114,5,0,0,0,114,191,0,0,0,50,3,0,
+ 0,0,0,114,5,0,0,0,114,191,0,0,0,53,3,0,
0,115,4,0,0,0,0,2,12,1,122,27,83,111,117,114,
99,101,70,105,108,101,76,111,97,100,101,114,46,112,97,116,
104,95,115,116,97,116,115,99,4,0,0,0,0,0,0,0,
@@ -1400,7 +1400,7 @@
97,0,0,0,114,192,0,0,0,41,5,114,100,0,0,0,
114,90,0,0,0,114,89,0,0,0,114,53,0,0,0,114,
42,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,
- 0,0,0,114,193,0,0,0,55,3,0,0,115,4,0,0,
+ 0,0,0,114,193,0,0,0,58,3,0,0,115,4,0,0,
0,0,2,12,1,122,32,83,111,117,114,99,101,70,105,108,
101,76,111,97,100,101,114,46,95,99,97,99,104,101,95,98,
121,116,101,99,111,100,101,114,214,0,0,0,105,182,1,0,
@@ -1439,7 +1439,7 @@
0,114,214,0,0,0,218,6,112,97,114,101,110,116,114,94,
0,0,0,114,27,0,0,0,114,23,0,0,0,114,195,0,
0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
- 0,114,192,0,0,0,60,3,0,0,115,42,0,0,0,0,
+ 0,114,192,0,0,0,63,3,0,0,115,42,0,0,0,0,
2,18,1,6,2,22,1,18,1,17,2,19,1,15,1,3,
1,17,1,13,2,7,1,18,3,9,1,10,1,27,1,3,
1,16,1,20,1,18,2,12,1,122,25,83,111,117,114,99,
@@ -1448,7 +1448,7 @@
0,114,106,0,0,0,114,107,0,0,0,114,191,0,0,0,
114,193,0,0,0,114,192,0,0,0,114,4,0,0,0,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,212,
- 0,0,0,46,3,0,0,115,8,0,0,0,12,2,6,2,
+ 0,0,0,49,3,0,0,115,8,0,0,0,12,2,6,2,
12,5,12,5,114,212,0,0,0,99,0,0,0,0,0,0,
0,0,0,0,0,0,2,0,0,0,64,0,0,0,115,46,
0,0,0,101,0,0,90,1,0,100,0,0,90,2,0,100,
@@ -1470,7 +1470,7 @@
0,114,141,0,0,0,41,5,114,100,0,0,0,114,119,0,
0,0,114,35,0,0,0,114,53,0,0,0,114,203,0,0,
0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,
- 114,181,0,0,0,95,3,0,0,115,8,0,0,0,0,1,
+ 114,181,0,0,0,98,3,0,0,115,8,0,0,0,0,1,
15,1,15,1,24,1,122,29,83,111,117,114,99,101,108,101,
115,115,70,105,108,101,76,111,97,100,101,114,46,103,101,116,
95,99,111,100,101,99,2,0,0,0,0,0,0,0,2,0,
@@ -1480,13 +1480,13 @@
111,32,115,111,117,114,99,101,32,99,111,100,101,46,78,114,
4,0,0,0,41,2,114,100,0,0,0,114,119,0,0,0,
114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,
- 196,0,0,0,101,3,0,0,115,2,0,0,0,0,2,122,
+ 196,0,0,0,104,3,0,0,115,2,0,0,0,0,2,122,
31,83,111,117,114,99,101,108,101,115,115,70,105,108,101,76,
111,97,100,101,114,46,103,101,116,95,115,111,117,114,99,101,
78,41,6,114,105,0,0,0,114,104,0,0,0,114,106,0,
0,0,114,107,0,0,0,114,181,0,0,0,114,196,0,0,
0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,114,217,0,0,0,91,3,0,0,115,6,
+ 114,5,0,0,0,114,217,0,0,0,94,3,0,0,115,6,
0,0,0,12,2,6,2,12,6,114,217,0,0,0,99,0,
0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64,
0,0,0,115,136,0,0,0,101,0,0,90,1,0,100,0,
@@ -1511,7 +1511,7 @@
1,0,100,0,0,83,41,1,78,41,2,114,98,0,0,0,
114,35,0,0,0,41,3,114,100,0,0,0,114,98,0,0,
0,114,35,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,114,179,0,0,0,118,3,0,0,115,4,
+ 114,5,0,0,0,114,179,0,0,0,121,3,0,0,115,4,
0,0,0,0,1,9,1,122,28,69,120,116,101,110,115,105,
111,110,70,105,108,101,76,111,97,100,101,114,46,95,95,105,
110,105,116,95,95,99,2,0,0,0,0,0,0,0,2,0,
@@ -1521,7 +1521,7 @@
83,41,1,78,41,2,114,205,0,0,0,114,111,0,0,0,
41,2,114,100,0,0,0,114,206,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,5,0,0,0,114,207,0,0,0,
- 122,3,0,0,115,4,0,0,0,0,1,18,1,122,26,69,
+ 125,3,0,0,115,4,0,0,0,0,1,18,1,122,26,69,
120,116,101,110,115,105,111,110,70,105,108,101,76,111,97,100,
101,114,46,95,95,101,113,95,95,99,1,0,0,0,0,0,
0,0,1,0,0,0,3,0,0,0,67,0,0,0,115,26,
@@ -1529,7 +1529,7 @@
0,0,124,0,0,106,2,0,131,1,0,65,83,41,1,78,
41,3,114,208,0,0,0,114,98,0,0,0,114,35,0,0,
0,41,1,114,100,0,0,0,114,4,0,0,0,114,4,0,
- 0,0,114,5,0,0,0,114,209,0,0,0,126,3,0,0,
+ 0,0,114,5,0,0,0,114,209,0,0,0,129,3,0,0,
115,2,0,0,0,0,1,122,28,69,120,116,101,110,115,105,
111,110,70,105,108,101,76,111,97,100,101,114,46,95,95,104,
97,115,104,95,95,99,2,0,0,0,0,0,0,0,3,0,
@@ -1547,7 +1547,7 @@
97,109,105,99,114,129,0,0,0,114,98,0,0,0,114,35,
0,0,0,41,3,114,100,0,0,0,114,158,0,0,0,114,
184,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,
- 0,0,0,114,180,0,0,0,129,3,0,0,115,10,0,0,
+ 0,0,0,114,180,0,0,0,132,3,0,0,115,10,0,0,
0,0,2,6,1,15,1,9,1,16,1,122,33,69,120,116,
101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,
46,99,114,101,97,116,101,95,109,111,100,117,108,101,99,2,
@@ -1565,7 +1565,7 @@
97,109,105,99,114,129,0,0,0,114,98,0,0,0,114,35,
0,0,0,41,2,114,100,0,0,0,114,184,0,0,0,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,185,
- 0,0,0,137,3,0,0,115,6,0,0,0,0,2,19,1,
+ 0,0,0,140,3,0,0,115,6,0,0,0,0,2,19,1,
9,1,122,31,69,120,116,101,110,115,105,111,110,70,105,108,
101,76,111,97,100,101,114,46,101,120,101,99,95,109,111,100,
117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0,
@@ -1583,7 +1583,7 @@
41,2,114,179,0,0,0,78,114,4,0,0,0,41,2,114,
22,0,0,0,218,6,115,117,102,102,105,120,41,1,218,9,
102,105,108,101,95,110,97,109,101,114,4,0,0,0,114,5,
- 0,0,0,250,9,60,103,101,110,101,120,112,114,62,146,3,
+ 0,0,0,250,9,60,103,101,110,101,120,112,114,62,149,3,
0,0,115,2,0,0,0,6,1,122,49,69,120,116,101,110,
115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,105,
115,95,112,97,99,107,97,103,101,46,60,108,111,99,97,108,
@@ -1592,7 +1592,7 @@
88,84,69,78,83,73,79,78,95,83,85,70,70,73,88,69,
83,41,2,114,100,0,0,0,114,119,0,0,0,114,4,0,
0,0,41,1,114,220,0,0,0,114,5,0,0,0,114,153,
- 0,0,0,143,3,0,0,115,6,0,0,0,0,2,19,1,
+ 0,0,0,146,3,0,0,115,6,0,0,0,0,2,19,1,
18,1,122,30,69,120,116,101,110,115,105,111,110,70,105,108,
101,76,111,97,100,101,114,46,105,115,95,112,97,99,107,97,
103,101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,
@@ -1603,7 +1603,7 @@
101,97,116,101,32,97,32,99,111,100,101,32,111,98,106,101,
99,116,46,78,114,4,0,0,0,41,2,114,100,0,0,0,
114,119,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 5,0,0,0,114,181,0,0,0,149,3,0,0,115,2,0,
+ 5,0,0,0,114,181,0,0,0,152,3,0,0,115,2,0,
0,0,0,2,122,28,69,120,116,101,110,115,105,111,110,70,
105,108,101,76,111,97,100,101,114,46,103,101,116,95,99,111,
100,101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,
@@ -1613,7 +1613,7 @@
117,108,101,115,32,104,97,118,101,32,110,111,32,115,111,117,
114,99,101,32,99,111,100,101,46,78,114,4,0,0,0,41,
2,114,100,0,0,0,114,119,0,0,0,114,4,0,0,0,
- 114,4,0,0,0,114,5,0,0,0,114,196,0,0,0,153,
+ 114,4,0,0,0,114,5,0,0,0,114,196,0,0,0,156,
3,0,0,115,2,0,0,0,0,2,122,30,69,120,116,101,
110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,
103,101,116,95,115,111,117,114,99,101,99,2,0,0,0,0,
@@ -1625,7 +1625,7 @@
101,32,102,105,110,100,101,114,46,41,1,114,35,0,0,0,
41,2,114,100,0,0,0,114,119,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,5,0,0,0,114,151,0,0,0,
- 157,3,0,0,115,2,0,0,0,0,3,122,32,69,120,116,
+ 160,3,0,0,115,2,0,0,0,0,3,122,32,69,120,116,
101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,
46,103,101,116,95,102,105,108,101,110,97,109,101,78,41,14,
114,105,0,0,0,114,104,0,0,0,114,106,0,0,0,114,
@@ -1633,7 +1633,7 @@
0,0,0,114,180,0,0,0,114,185,0,0,0,114,153,0,
0,0,114,181,0,0,0,114,196,0,0,0,114,116,0,0,
0,114,151,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,4,0,0,0,114,5,0,0,0,114,218,0,0,0,110,
+ 114,4,0,0,0,114,5,0,0,0,114,218,0,0,0,113,
3,0,0,115,20,0,0,0,12,6,6,2,12,4,12,4,
12,3,12,8,12,6,12,6,12,4,12,4,114,218,0,0,
0,99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
@@ -1679,7 +1679,7 @@
4,114,100,0,0,0,114,98,0,0,0,114,35,0,0,0,
218,11,112,97,116,104,95,102,105,110,100,101,114,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,114,179,0,0,
- 0,170,3,0,0,115,8,0,0,0,0,1,9,1,9,1,
+ 0,173,3,0,0,115,8,0,0,0,0,1,9,1,9,1,
21,1,122,23,95,78,97,109,101,115,112,97,99,101,80,97,
116,104,46,95,95,105,110,105,116,95,95,99,1,0,0,0,
0,0,0,0,4,0,0,0,3,0,0,0,67,0,0,0,
@@ -1698,7 +1698,7 @@
3,100,111,116,90,2,109,101,114,4,0,0,0,114,4,0,
0,0,114,5,0,0,0,218,23,95,102,105,110,100,95,112,
97,114,101,110,116,95,112,97,116,104,95,110,97,109,101,115,
- 176,3,0,0,115,8,0,0,0,0,2,27,1,12,2,4,
+ 179,3,0,0,115,8,0,0,0,0,2,27,1,12,2,4,
3,122,38,95,78,97,109,101,115,112,97,99,101,80,97,116,
104,46,95,102,105,110,100,95,112,97,114,101,110,116,95,112,
97,116,104,95,110,97,109,101,115,99,1,0,0,0,0,0,
@@ -1711,7 +1711,7 @@
97,114,101,110,116,95,109,111,100,117,108,101,95,110,97,109,
101,90,14,112,97,116,104,95,97,116,116,114,95,110,97,109,
101,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,
- 114,227,0,0,0,186,3,0,0,115,4,0,0,0,0,1,
+ 114,227,0,0,0,189,3,0,0,115,4,0,0,0,0,1,
18,1,122,31,95,78,97,109,101,115,112,97,99,101,80,97,
116,104,46,95,103,101,116,95,112,97,114,101,110,116,95,112,
97,116,104,99,1,0,0,0,0,0,0,0,3,0,0,0,
@@ -1729,7 +1729,7 @@
41,3,114,100,0,0,0,90,11,112,97,114,101,110,116,95,
112,97,116,104,114,158,0,0,0,114,4,0,0,0,114,4,
0,0,0,114,5,0,0,0,218,12,95,114,101,99,97,108,
- 99,117,108,97,116,101,190,3,0,0,115,16,0,0,0,0,
+ 99,117,108,97,116,101,193,3,0,0,115,16,0,0,0,0,
2,18,1,15,1,21,3,27,1,9,1,12,1,9,1,122,
27,95,78,97,109,101,115,112,97,99,101,80,97,116,104,46,
95,114,101,99,97,108,99,117,108,97,116,101,99,1,0,0,
@@ -1738,7 +1738,7 @@
0,0,131,1,0,83,41,1,78,41,2,218,4,105,116,101,
114,114,234,0,0,0,41,1,114,100,0,0,0,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,218,8,95,95,
- 105,116,101,114,95,95,203,3,0,0,115,2,0,0,0,0,
+ 105,116,101,114,95,95,206,3,0,0,115,2,0,0,0,0,
1,122,23,95,78,97,109,101,115,112,97,99,101,80,97,116,
104,46,95,95,105,116,101,114,95,95,99,3,0,0,0,0,
0,0,0,3,0,0,0,3,0,0,0,67,0,0,0,115,
@@ -1746,7 +1746,7 @@
60,100,0,0,83,41,1,78,41,1,114,226,0,0,0,41,
3,114,100,0,0,0,218,5,105,110,100,101,120,114,35,0,
0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
- 0,218,11,95,95,115,101,116,105,116,101,109,95,95,206,3,
+ 0,218,11,95,95,115,101,116,105,116,101,109,95,95,209,3,
0,0,115,2,0,0,0,0,1,122,26,95,78,97,109,101,
115,112,97,99,101,80,97,116,104,46,95,95,115,101,116,105,
116,101,109,95,95,99,1,0,0,0,0,0,0,0,1,0,
@@ -1754,7 +1754,7 @@
0,0,124,0,0,106,1,0,131,0,0,131,1,0,83,41,
1,78,41,2,114,31,0,0,0,114,234,0,0,0,41,1,
114,100,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 5,0,0,0,218,7,95,95,108,101,110,95,95,209,3,0,
+ 5,0,0,0,218,7,95,95,108,101,110,95,95,212,3,0,
0,115,2,0,0,0,0,1,122,22,95,78,97,109,101,115,
112,97,99,101,80,97,116,104,46,95,95,108,101,110,95,95,
99,1,0,0,0,0,0,0,0,1,0,0,0,2,0,0,
@@ -1763,7 +1763,7 @@
78,97,109,101,115,112,97,99,101,80,97,116,104,40,123,33,
114,125,41,41,2,114,47,0,0,0,114,226,0,0,0,41,
1,114,100,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,218,8,95,95,114,101,112,114,95,95,212,
+ 114,5,0,0,0,218,8,95,95,114,101,112,114,95,95,215,
3,0,0,115,2,0,0,0,0,1,122,23,95,78,97,109,
101,115,112,97,99,101,80,97,116,104,46,95,95,114,101,112,
114,95,95,99,2,0,0,0,0,0,0,0,2,0,0,0,
@@ -1772,7 +1772,7 @@
41,1,114,234,0,0,0,41,2,114,100,0,0,0,218,4,
105,116,101,109,114,4,0,0,0,114,4,0,0,0,114,5,
0,0,0,218,12,95,95,99,111,110,116,97,105,110,115,95,
- 95,215,3,0,0,115,2,0,0,0,0,1,122,27,95,78,
+ 95,218,3,0,0,115,2,0,0,0,0,1,122,27,95,78,
97,109,101,115,112,97,99,101,80,97,116,104,46,95,95,99,
111,110,116,97,105,110,115,95,95,99,2,0,0,0,0,0,
0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,20,
@@ -1780,7 +1780,7 @@
1,0,1,100,0,0,83,41,1,78,41,2,114,226,0,0,
0,114,157,0,0,0,41,2,114,100,0,0,0,114,241,0,
0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
- 0,114,157,0,0,0,218,3,0,0,115,2,0,0,0,0,
+ 0,114,157,0,0,0,221,3,0,0,115,2,0,0,0,0,
1,122,21,95,78,97,109,101,115,112,97,99,101,80,97,116,
104,46,97,112,112,101,110,100,78,41,14,114,105,0,0,0,
114,104,0,0,0,114,106,0,0,0,114,107,0,0,0,114,
@@ -1788,7 +1788,7 @@
0,0,0,114,236,0,0,0,114,238,0,0,0,114,239,0,
0,0,114,240,0,0,0,114,242,0,0,0,114,157,0,0,
0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,114,224,0,0,0,163,3,0,0,115,22,
+ 114,5,0,0,0,114,224,0,0,0,166,3,0,0,115,22,
0,0,0,12,5,6,2,12,6,12,10,12,4,12,13,12,
3,12,3,12,3,12,3,12,3,114,224,0,0,0,99,0,
0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64,
@@ -1807,7 +1807,7 @@
0,100,0,0,83,41,1,78,41,2,114,224,0,0,0,114,
226,0,0,0,41,4,114,100,0,0,0,114,98,0,0,0,
114,35,0,0,0,114,230,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,179,0,0,0,224,3,
+ 4,0,0,0,114,5,0,0,0,114,179,0,0,0,227,3,
0,0,115,2,0,0,0,0,1,122,25,95,78,97,109,101,
115,112,97,99,101,76,111,97,100,101,114,46,95,95,105,110,
105,116,95,95,99,2,0,0,0,0,0,0,0,2,0,0,
@@ -1825,21 +1825,21 @@
41,2,114,47,0,0,0,114,105,0,0,0,41,2,114,164,
0,0,0,114,184,0,0,0,114,4,0,0,0,114,4,0,
0,0,114,5,0,0,0,218,11,109,111,100,117,108,101,95,
- 114,101,112,114,227,3,0,0,115,2,0,0,0,0,7,122,
+ 114,101,112,114,230,3,0,0,115,2,0,0,0,0,7,122,
28,95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,
114,46,109,111,100,117,108,101,95,114,101,112,114,99,2,0,
0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,
0,0,115,4,0,0,0,100,1,0,83,41,2,78,84,114,
4,0,0,0,41,2,114,100,0,0,0,114,119,0,0,0,
114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,
- 153,0,0,0,236,3,0,0,115,2,0,0,0,0,1,122,
+ 153,0,0,0,239,3,0,0,115,2,0,0,0,0,1,122,
27,95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,
114,46,105,115,95,112,97,99,107,97,103,101,99,2,0,0,
0,0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,
0,115,4,0,0,0,100,1,0,83,41,2,78,114,30,0,
0,0,114,4,0,0,0,41,2,114,100,0,0,0,114,119,
0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,
- 0,0,114,196,0,0,0,239,3,0,0,115,2,0,0,0,
+ 0,0,114,196,0,0,0,242,3,0,0,115,2,0,0,0,
0,1,122,27,95,78,97,109,101,115,112,97,99,101,76,111,
97,100,101,114,46,103,101,116,95,115,111,117,114,99,101,99,
2,0,0,0,0,0,0,0,2,0,0,0,6,0,0,0,
@@ -1849,7 +1849,7 @@
62,114,183,0,0,0,114,198,0,0,0,84,41,1,114,199,
0,0,0,41,2,114,100,0,0,0,114,119,0,0,0,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,181,
- 0,0,0,242,3,0,0,115,2,0,0,0,0,1,122,25,
+ 0,0,0,245,3,0,0,115,2,0,0,0,0,1,122,25,
95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,114,
46,103,101,116,95,99,111,100,101,99,2,0,0,0,0,0,
0,0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,
@@ -1858,14 +1858,14 @@
32,102,111,114,32,109,111,100,117,108,101,32,99,114,101,97,
116,105,111,110,46,78,114,4,0,0,0,41,2,114,100,0,
0,0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,
- 0,114,5,0,0,0,114,180,0,0,0,245,3,0,0,115,
+ 0,114,5,0,0,0,114,180,0,0,0,248,3,0,0,115,
0,0,0,0,122,30,95,78,97,109,101,115,112,97,99,101,
76,111,97,100,101,114,46,99,114,101,97,116,101,95,109,111,
100,117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,
0,1,0,0,0,67,0,0,0,115,4,0,0,0,100,0,
0,83,41,1,78,114,4,0,0,0,41,2,114,100,0,0,
0,114,184,0,0,0,114,4,0,0,0,114,4,0,0,0,
- 114,5,0,0,0,114,185,0,0,0,248,3,0,0,115,2,
+ 114,5,0,0,0,114,185,0,0,0,251,3,0,0,115,2,
0,0,0,0,1,122,28,95,78,97,109,101,115,112,97,99,
101,76,111,97,100,101,114,46,101,120,101,99,95,109,111,100,
117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0,
@@ -1884,7 +1884,7 @@
114,114,0,0,0,114,129,0,0,0,114,226,0,0,0,114,
186,0,0,0,41,2,114,100,0,0,0,114,119,0,0,0,
114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,
- 187,0,0,0,251,3,0,0,115,6,0,0,0,0,7,9,
+ 187,0,0,0,254,3,0,0,115,6,0,0,0,0,7,9,
1,10,1,122,28,95,78,97,109,101,115,112,97,99,101,76,
111,97,100,101,114,46,108,111,97,100,95,109,111,100,117,108,
101,78,41,12,114,105,0,0,0,114,104,0,0,0,114,106,
@@ -1892,7 +1892,7 @@
0,0,114,153,0,0,0,114,196,0,0,0,114,181,0,0,
0,114,180,0,0,0,114,185,0,0,0,114,187,0,0,0,
114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 5,0,0,0,114,243,0,0,0,223,3,0,0,115,16,0,
+ 5,0,0,0,114,243,0,0,0,226,3,0,0,115,16,0,
0,0,12,1,12,3,18,9,12,3,12,3,12,3,12,3,
12,3,114,243,0,0,0,99,0,0,0,0,0,0,0,0,
0,0,0,0,5,0,0,0,64,0,0,0,115,160,0,0,
@@ -1930,7 +1930,7 @@
101,218,6,118,97,108,117,101,115,114,108,0,0,0,114,246,
0,0,0,41,2,114,164,0,0,0,218,6,102,105,110,100,
101,114,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
- 0,114,246,0,0,0,13,4,0,0,115,6,0,0,0,0,
+ 0,114,246,0,0,0,16,4,0,0,115,6,0,0,0,0,
4,22,1,15,1,122,28,80,97,116,104,70,105,110,100,101,
114,46,105,110,118,97,108,105,100,97,116,101,95,99,97,99,
104,101,115,99,2,0,0,0,0,0,0,0,3,0,0,0,
@@ -1955,7 +1955,7 @@
61,0,0,0,114,118,0,0,0,114,99,0,0,0,41,3,
114,164,0,0,0,114,35,0,0,0,90,4,104,111,111,107,
114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,
- 11,95,112,97,116,104,95,104,111,111,107,115,21,4,0,0,
+ 11,95,112,97,116,104,95,104,111,111,107,115,24,4,0,0,
115,16,0,0,0,0,7,25,1,16,1,16,1,3,1,14,
1,13,1,12,2,122,22,80,97,116,104,70,105,110,100,101,
114,46,95,112,97,116,104,95,104,111,111,107,115,99,2,0,
@@ -1988,7 +1988,7 @@
0,41,3,114,164,0,0,0,114,35,0,0,0,114,249,0,
0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,
0,218,20,95,112,97,116,104,95,105,109,112,111,114,116,101,
- 114,95,99,97,99,104,101,38,4,0,0,115,22,0,0,0,
+ 114,95,99,97,99,104,101,41,4,0,0,115,22,0,0,0,
0,8,12,1,3,1,16,1,13,3,9,1,3,1,17,1,
13,1,15,1,18,1,122,31,80,97,116,104,70,105,110,100,
101,114,46,95,112,97,116,104,95,105,109,112,111,114,116,101,
@@ -2008,7 +2008,7 @@
0,114,249,0,0,0,114,120,0,0,0,114,121,0,0,0,
114,158,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
5,0,0,0,218,16,95,108,101,103,97,99,121,95,103,101,
- 116,95,115,112,101,99,60,4,0,0,115,18,0,0,0,0,
+ 116,95,115,112,101,99,63,4,0,0,115,18,0,0,0,0,
4,15,1,24,2,15,1,6,1,12,1,16,1,18,1,9,
1,122,27,80,97,116,104,70,105,110,100,101,114,46,95,108,
101,103,97,99,121,95,103,101,116,95,115,112,101,99,78,99,
@@ -2044,7 +2044,7 @@
95,112,97,116,104,90,5,101,110,116,114,121,114,249,0,0,
0,114,158,0,0,0,114,121,0,0,0,114,4,0,0,0,
114,4,0,0,0,114,5,0,0,0,218,9,95,103,101,116,
- 95,115,112,101,99,75,4,0,0,115,40,0,0,0,0,5,
+ 95,115,112,101,99,78,4,0,0,115,40,0,0,0,0,5,
6,1,13,1,21,1,3,1,15,1,12,1,15,1,21,2,
18,1,12,1,3,1,15,1,4,1,9,1,12,1,12,5,
17,2,18,1,9,1,122,20,80,97,116,104,70,105,110,100,
@@ -2071,7 +2071,7 @@
152,0,0,0,114,224,0,0,0,41,6,114,164,0,0,0,
114,119,0,0,0,114,35,0,0,0,114,174,0,0,0,114,
158,0,0,0,114,0,1,0,0,114,4,0,0,0,114,4,
- 0,0,0,114,5,0,0,0,114,175,0,0,0,107,4,0,
+ 0,0,0,114,5,0,0,0,114,175,0,0,0,110,4,0,
0,115,26,0,0,0,0,4,12,1,9,1,21,1,12,1,
4,1,15,1,9,1,6,3,9,1,24,1,4,2,7,2,
122,20,80,97,116,104,70,105,110,100,101,114,46,102,105,110,
@@ -2093,7 +2093,7 @@
32,32,32,32,32,32,32,78,41,2,114,175,0,0,0,114,
120,0,0,0,41,4,114,164,0,0,0,114,119,0,0,0,
114,35,0,0,0,114,158,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,176,0,0,0,129,4,
+ 4,0,0,0,114,5,0,0,0,114,176,0,0,0,132,4,
0,0,115,8,0,0,0,0,8,18,1,12,1,4,1,122,
22,80,97,116,104,70,105,110,100,101,114,46,102,105,110,100,
95,109,111,100,117,108,101,41,12,114,105,0,0,0,114,104,
@@ -2101,7 +2101,7 @@
0,0,114,246,0,0,0,114,251,0,0,0,114,253,0,0,
0,114,254,0,0,0,114,1,1,0,0,114,175,0,0,0,
114,176,0,0,0,114,4,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,245,0,0,0,9,4,
+ 4,0,0,0,114,5,0,0,0,114,245,0,0,0,12,4,
0,0,115,22,0,0,0,12,2,6,2,18,8,18,17,18,
22,18,15,3,1,18,31,3,1,21,21,3,1,114,245,0,
0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,
@@ -2150,7 +2150,7 @@
1,0,124,1,0,136,0,0,102,2,0,86,1,113,3,0,
100,0,0,83,41,1,78,114,4,0,0,0,41,2,114,22,
0,0,0,114,219,0,0,0,41,1,114,120,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,221,0,0,0,158,4,
+ 4,0,0,0,114,5,0,0,0,114,221,0,0,0,161,4,
0,0,115,2,0,0,0,6,0,122,38,70,105,108,101,70,
105,110,100,101,114,46,95,95,105,110,105,116,95,95,46,60,
108,111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,
@@ -2163,7 +2163,7 @@
0,0,114,35,0,0,0,218,14,108,111,97,100,101,114,95,
100,101,116,97,105,108,115,90,7,108,111,97,100,101,114,115,
114,160,0,0,0,114,4,0,0,0,41,1,114,120,0,0,
- 0,114,5,0,0,0,114,179,0,0,0,152,4,0,0,115,
+ 0,114,5,0,0,0,114,179,0,0,0,155,4,0,0,115,
16,0,0,0,0,4,6,1,19,1,36,1,9,2,15,1,
9,1,12,1,122,19,70,105,108,101,70,105,110,100,101,114,
46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0,
@@ -2174,7 +2174,7 @@
109,101,46,114,29,0,0,0,78,114,87,0,0,0,41,1,
114,4,1,0,0,41,1,114,100,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,5,0,0,0,114,246,0,0,0,
- 166,4,0,0,115,2,0,0,0,0,2,122,28,70,105,108,
+ 169,4,0,0,115,2,0,0,0,0,2,122,28,70,105,108,
101,70,105,110,100,101,114,46,105,110,118,97,108,105,100,97,
116,101,95,99,97,99,104,101,115,99,2,0,0,0,0,0,
0,0,3,0,0,0,2,0,0,0,67,0,0,0,115,59,
@@ -2197,7 +2197,7 @@
32,32,32,32,32,32,32,78,41,3,114,175,0,0,0,114,
120,0,0,0,114,150,0,0,0,41,3,114,100,0,0,0,
114,119,0,0,0,114,158,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,117,0,0,0,172,4,
+ 4,0,0,0,114,5,0,0,0,114,117,0,0,0,175,4,
0,0,115,8,0,0,0,0,7,15,1,12,1,10,1,122,
22,70,105,108,101,70,105,110,100,101,114,46,102,105,110,100,
95,108,111,97,100,101,114,99,6,0,0,0,0,0,0,0,
@@ -2209,7 +2209,7 @@
100,0,0,0,114,159,0,0,0,114,119,0,0,0,114,35,
0,0,0,90,4,115,109,115,108,114,174,0,0,0,114,120,
0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,
- 0,0,114,1,1,0,0,184,4,0,0,115,6,0,0,0,
+ 0,0,114,1,1,0,0,187,4,0,0,115,6,0,0,0,
0,1,15,1,18,1,122,20,70,105,108,101,70,105,110,100,
101,114,46,95,103,101,116,95,115,112,101,99,78,99,3,0,
0,0,0,0,0,0,14,0,0,0,15,0,0,0,67,0,
@@ -2272,7 +2272,7 @@
104,114,219,0,0,0,114,159,0,0,0,90,13,105,110,105,
116,95,102,105,108,101,110,97,109,101,90,9,102,117,108,108,
95,112,97,116,104,114,158,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,175,0,0,0,189,4,
+ 4,0,0,0,114,5,0,0,0,114,175,0,0,0,192,4,
0,0,115,70,0,0,0,0,3,6,1,19,1,3,1,34,
1,13,1,11,1,15,1,10,1,9,2,9,1,9,1,15,
2,9,1,6,2,12,1,18,1,22,1,10,1,15,1,12,
@@ -2309,7 +2309,7 @@
146,2,0,113,6,0,83,114,4,0,0,0,41,1,114,88,
0,0,0,41,2,114,22,0,0,0,90,2,102,110,114,4,
0,0,0,114,4,0,0,0,114,5,0,0,0,250,9,60,
- 115,101,116,99,111,109,112,62,8,5,0,0,115,2,0,0,
+ 115,101,116,99,111,109,112,62,11,5,0,0,115,2,0,0,
0,9,0,122,41,70,105,108,101,70,105,110,100,101,114,46,
95,102,105,108,108,95,99,97,99,104,101,46,60,108,111,99,
97,108,115,62,46,60,115,101,116,99,111,109,112,62,78,41,
@@ -2326,7 +2326,7 @@
111,110,116,101,110,116,115,114,241,0,0,0,114,98,0,0,
0,114,231,0,0,0,114,219,0,0,0,90,8,110,101,119,
95,110,97,109,101,114,4,0,0,0,114,4,0,0,0,114,
- 5,0,0,0,114,9,1,0,0,235,4,0,0,115,34,0,
+ 5,0,0,0,114,9,1,0,0,238,4,0,0,115,34,0,
0,0,0,2,9,1,3,1,31,1,22,3,11,3,18,1,
18,7,9,1,13,1,24,1,6,1,27,2,6,1,17,1,
9,1,18,1,122,22,70,105,108,101,70,105,110,100,101,114,
@@ -2365,7 +2365,7 @@
0,41,1,114,35,0,0,0,41,2,114,164,0,0,0,114,
8,1,0,0,114,4,0,0,0,114,5,0,0,0,218,24,
112,97,116,104,95,104,111,111,107,95,102,111,114,95,70,105,
- 108,101,70,105,110,100,101,114,20,5,0,0,115,6,0,0,
+ 108,101,70,105,110,100,101,114,23,5,0,0,115,6,0,0,
0,0,2,12,1,18,1,122,54,70,105,108,101,70,105,110,
100,101,114,46,112,97,116,104,95,104,111,111,107,46,60,108,
111,99,97,108,115,62,46,112,97,116,104,95,104,111,111,107,
@@ -2373,7 +2373,7 @@
4,0,0,0,41,3,114,164,0,0,0,114,8,1,0,0,
114,14,1,0,0,114,4,0,0,0,41,2,114,164,0,0,
0,114,8,1,0,0,114,5,0,0,0,218,9,112,97,116,
- 104,95,104,111,111,107,10,5,0,0,115,4,0,0,0,0,
+ 104,95,104,111,111,107,13,5,0,0,115,4,0,0,0,0,
10,21,6,122,20,70,105,108,101,70,105,110,100,101,114,46,
112,97,116,104,95,104,111,111,107,99,1,0,0,0,0,0,
0,0,1,0,0,0,2,0,0,0,67,0,0,0,115,16,
@@ -2381,7 +2381,7 @@
1,0,83,41,2,78,122,16,70,105,108,101,70,105,110,100,
101,114,40,123,33,114,125,41,41,2,114,47,0,0,0,114,
35,0,0,0,41,1,114,100,0,0,0,114,4,0,0,0,
- 114,4,0,0,0,114,5,0,0,0,114,240,0,0,0,28,
+ 114,4,0,0,0,114,5,0,0,0,114,240,0,0,0,31,
5,0,0,115,2,0,0,0,0,1,122,19,70,105,108,101,
70,105,110,100,101,114,46,95,95,114,101,112,114,95,95,41,
15,114,105,0,0,0,114,104,0,0,0,114,106,0,0,0,
@@ -2390,7 +2390,7 @@
1,0,0,114,175,0,0,0,114,9,1,0,0,114,177,0,
0,0,114,15,1,0,0,114,240,0,0,0,114,4,0,0,
0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,
- 114,2,1,0,0,143,4,0,0,115,20,0,0,0,12,7,
+ 114,2,1,0,0,146,4,0,0,115,20,0,0,0,12,7,
6,2,12,14,12,4,6,2,12,12,12,5,15,46,12,31,
18,18,114,2,1,0,0,99,4,0,0,0,0,0,0,0,
6,0,0,0,11,0,0,0,67,0,0,0,115,195,0,0,
@@ -2416,7 +2416,7 @@
97,109,101,90,9,99,112,97,116,104,110,97,109,101,114,120,
0,0,0,114,158,0,0,0,114,4,0,0,0,114,4,0,
0,0,114,5,0,0,0,218,14,95,102,105,120,95,117,112,
- 95,109,111,100,117,108,101,34,5,0,0,115,34,0,0,0,
+ 95,109,111,100,117,108,101,37,5,0,0,115,34,0,0,0,
0,2,15,1,15,1,6,1,6,1,12,1,12,1,18,2,
15,1,6,1,21,1,3,1,10,1,10,1,10,1,14,1,
13,2,114,20,1,0,0,99,0,0,0,0,0,0,0,0,
@@ -2437,7 +2437,7 @@
3,90,10,101,120,116,101,110,115,105,111,110,115,90,6,115,
111,117,114,99,101,90,8,98,121,116,101,99,111,100,101,114,
4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,155,
- 0,0,0,57,5,0,0,115,8,0,0,0,0,5,18,1,
+ 0,0,0,60,5,0,0,115,8,0,0,0,0,5,18,1,
12,1,12,1,114,155,0,0,0,99,1,0,0,0,0,0,
0,0,12,0,0,0,12,0,0,0,67,0,0,0,115,70,
2,0,0,124,0,0,97,0,0,116,0,0,106,1,0,97,
@@ -2498,7 +2498,7 @@
100,0,0,107,2,0,86,1,113,3,0,100,1,0,83,41,
2,114,29,0,0,0,78,41,1,114,31,0,0,0,41,2,
114,22,0,0,0,114,77,0,0,0,114,4,0,0,0,114,
- 4,0,0,0,114,5,0,0,0,114,221,0,0,0,93,5,
+ 4,0,0,0,114,5,0,0,0,114,221,0,0,0,96,5,
0,0,115,2,0,0,0,6,0,122,25,95,115,101,116,117,
112,46,60,108,111,99,97,108,115,62,46,60,103,101,110,101,
120,112,114,62,114,59,0,0,0,122,30,105,109,112,111,114,
@@ -2529,7 +2529,7 @@
119,101,97,107,114,101,102,95,109,111,100,117,108,101,90,13,
119,105,110,114,101,103,95,109,111,100,117,108,101,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,218,6,95,115,
- 101,116,117,112,68,5,0,0,115,82,0,0,0,0,8,6,
+ 101,116,117,112,71,5,0,0,115,82,0,0,0,0,8,6,
1,9,1,9,3,13,1,13,1,15,1,18,2,13,1,20,
3,33,1,19,2,31,1,10,1,15,1,13,1,4,2,3,
1,15,1,5,1,13,1,12,2,12,1,16,1,16,1,25,
@@ -2555,7 +2555,7 @@
0,0,0,41,2,114,28,1,0,0,90,17,115,117,112,112,
111,114,116,101,100,95,108,111,97,100,101,114,115,114,4,0,
0,0,114,4,0,0,0,114,5,0,0,0,218,8,95,105,
- 110,115,116,97,108,108,136,5,0,0,115,16,0,0,0,0,
+ 110,115,116,97,108,108,139,5,0,0,115,16,0,0,0,0,
2,10,1,9,1,28,1,15,1,16,1,16,4,9,1,114,
31,1,0,0,41,3,122,3,119,105,110,114,1,0,0,0,
114,2,0,0,0,41,56,114,107,0,0,0,114,10,0,0,
@@ -2584,7 +2584,7 @@
0,114,5,0,0,0,218,8,60,109,111,100,117,108,101,62,
8,0,0,0,115,102,0,0,0,6,17,6,3,12,12,12,
5,12,5,12,6,12,12,12,10,12,9,12,5,12,7,15,
- 22,15,112,22,1,18,2,6,1,6,2,9,2,9,2,10,
+ 22,15,115,22,1,18,2,6,1,6,2,9,2,9,2,10,
2,21,44,12,33,12,19,12,12,12,12,12,28,12,17,21,
55,21,12,18,10,12,14,9,3,12,1,15,65,19,64,19,
29,22,110,19,41,25,45,25,16,6,3,25,53,19,60,19,
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list