Skip to content

Commit 71cffca

Browse files
AyutoAyuto
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into engine_sdk2013
2 parents 37d0465 + 16db885 commit 71cffca

File tree

9,396 files changed

+646836
-309335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,396 files changed

+646836
-309335
lines changed

‎addons/source-python/Python3/_collections_abc.py‎

Lines changed: 124 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
from abc import ABCMeta, abstractmethod
1010
import sys
1111

12-
__all__ = ["Awaitable", "Coroutine", "AsyncIterable", "AsyncIterator",
13-
"Hashable", "Iterable", "Iterator", "Generator",
14-
"Sized", "Container", "Callable",
12+
__all__ = ["Awaitable", "Coroutine",
13+
"AsyncIterable", "AsyncIterator", "AsyncGenerator",
14+
"Hashable", "Iterable", "Iterator", "Generator", "Reversible",
15+
"Sized", "Container", "Callable", "Collection",
1516
"Set", "MutableSet",
1617
"Mapping", "MutableMapping",
1718
"MappingView", "KeysView", "ItemsView", "ValuesView",
@@ -29,8 +30,8 @@
2930
# so that they will pass tests like:
3031
# it = iter(somebytearray)
3132
# assert isinstance(it, Iterable)
32-
# Note: in other implementations, these types many not be distinct
33-
# and they make have their own implementation specific types that
33+
# Note: in other implementations, these types might not be distinct
34+
# and they may have their own implementation specific types that
3435
# are not included on this list.
3536
bytes_iterator = type(iter(b''))
3637
bytearray_iterator = type(iter(bytearray()))
@@ -41,6 +42,7 @@
4142
list_iterator = type(iter([]))
4243
list_reverseiterator = type(iter(reversed([])))
4344
range_iterator = type(iter(range(0)))
45+
longrange_iterator = type(iter(range(1 << 1000)))
4446
set_iterator = type(iter(set()))
4547
str_iterator = type(iter(""))
4648
tuple_iterator = type(iter(()))
@@ -58,10 +60,27 @@ async def _coro(): pass
5860
coroutine = type(_coro)
5961
_coro.close() # Prevent ResourceWarning
6062
del _coro
63+
## asynchronous generator ##
64+
async def _ag(): yield
65+
_ag = _ag()
66+
async_generator = type(_ag)
67+
del _ag
6168

6269

6370
### ONE-TRICK PONIES ###
6471

72+
def _check_methods(C, *methods):
73+
mro = C.__mro__
74+
for method in methods:
75+
for B in mro:
76+
if method in B.__dict__:
77+
if B.__dict__[method] is None:
78+
return NotImplemented
79+
break
80+
else:
81+
return NotImplemented
82+
return True
83+
6584
class Hashable(metaclass=ABCMeta):
6685

6786
__slots__ = ()
@@ -73,11 +92,7 @@ def __hash__(self):
7392
@classmethod
7493
def __subclasshook__(cls, C):
7594
if cls is Hashable:
76-
for B in C.__mro__:
77-
if "__hash__" in B.__dict__:
78-
if B.__dict__["__hash__"]:
79-
return True
80-
break
95+
return _check_methods(C, "__hash__")
8196
return NotImplemented
8297

8398

@@ -92,11 +107,7 @@ def __await__(self):
92107
@classmethod
93108
def __subclasshook__(cls, C):
94109
if cls is Awaitable:
95-
for B in C.__mro__:
96-
if "__await__" in B.__dict__:
97-
if B.__dict__["__await__"]:
98-
return True
99-
break
110+
return _check_methods(C, "__await__")
100111
return NotImplemented
101112

102113

@@ -137,14 +148,7 @@ def close(self):
137148
@classmethod
138149
def __subclasshook__(cls, C):
139150
if cls is Coroutine:
140-
mro = C.__mro__
141-
for method in ('__await__', 'send', 'throw', 'close'):
142-
for base in mro:
143-
if method in base.__dict__:
144-
break
145-
else:
146-
return NotImplemented
147-
return True
151+
return _check_methods(C, '__await__', 'send', 'throw', 'close')
148152
return NotImplemented
149153

150154

@@ -156,14 +160,13 @@ class AsyncIterable(metaclass=ABCMeta):
156160
__slots__ = ()
157161

158162
@abstractmethod
159-
async def __aiter__(self):
163+
def __aiter__(self):
160164
return AsyncIterator()
161165

162166
@classmethod
163167
def __subclasshook__(cls, C):
164168
if cls is AsyncIterable:
165-
if any("__aiter__" in B.__dict__ for B in C.__mro__):
166-
return True
169+
return _check_methods(C, "__aiter__")
167170
return NotImplemented
168171

169172

@@ -176,18 +179,67 @@ async def __anext__(self):
176179
"""Return the next item or raise StopAsyncIteration when exhausted."""
177180
raise StopAsyncIteration
178181

179-
async def __aiter__(self):
182+
def __aiter__(self):
180183
return self
181184

182185
@classmethod
183186
def __subclasshook__(cls, C):
184187
if cls is AsyncIterator:
185-
if (any("__anext__" in B.__dict__ for B in C.__mro__) and
186-
any("__aiter__" in B.__dict__ for B in C.__mro__)):
187-
return True
188+
return _check_methods(C, "__anext__", "__aiter__")
188189
return NotImplemented
189190

190191

192+
class AsyncGenerator(AsyncIterator):
193+
194+
__slots__ = ()
195+
196+
async def __anext__(self):
197+
"""Return the next item from the asynchronous generator.
198+
When exhausted, raise StopAsyncIteration.
199+
"""
200+
return await self.asend(None)
201+
202+
@abstractmethod
203+
async def asend(self, value):
204+
"""Send a value into the asynchronous generator.
205+
Return next yielded value or raise StopAsyncIteration.
206+
"""
207+
raise StopAsyncIteration
208+
209+
@abstractmethod
210+
async def athrow(self, typ, val=None, tb=None):
211+
"""Raise an exception in the asynchronous generator.
212+
Return next yielded value or raise StopAsyncIteration.
213+
"""
214+
if val is None:
215+
if tb is None:
216+
raise typ
217+
val = typ()
218+
if tb is not None:
219+
val = val.with_traceback(tb)
220+
raise val
221+
222+
async def aclose(self):
223+
"""Raise GeneratorExit inside coroutine.
224+
"""
225+
try:
226+
await self.athrow(GeneratorExit)
227+
except (GeneratorExit, StopAsyncIteration):
228+
pass
229+
else:
230+
raise RuntimeError("asynchronous generator ignored GeneratorExit")
231+
232+
@classmethod
233+
def __subclasshook__(cls, C):
234+
if cls is AsyncGenerator:
235+
return _check_methods(C, '__aiter__', '__anext__',
236+
'asend', 'athrow', 'aclose')
237+
return NotImplemented
238+
239+
240+
AsyncGenerator.register(async_generator)
241+
242+
191243
class Iterable(metaclass=ABCMeta):
192244

193245
__slots__ = ()
@@ -200,8 +252,7 @@ def __iter__(self):
200252
@classmethod
201253
def __subclasshook__(cls, C):
202254
if cls is Iterable:
203-
if any("__iter__" in B.__dict__ for B in C.__mro__):
204-
return True
255+
return _check_methods(C, "__iter__")
205256
return NotImplemented
206257

207258

@@ -220,9 +271,7 @@ def __iter__(self):
220271
@classmethod
221272
def __subclasshook__(cls, C):
222273
if cls is Iterator:
223-
if (any("__next__" in B.__dict__ for B in C.__mro__) and
224-
any("__iter__" in B.__dict__ for B in C.__mro__)):
225-
return True
274+
return _check_methods(C, '__iter__', '__next__')
226275
return NotImplemented
227276

228277
Iterator.register(bytes_iterator)
@@ -234,12 +283,29 @@ def __subclasshook__(cls, C):
234283
Iterator.register(list_iterator)
235284
Iterator.register(list_reverseiterator)
236285
Iterator.register(range_iterator)
286+
Iterator.register(longrange_iterator)
237287
Iterator.register(set_iterator)
238288
Iterator.register(str_iterator)
239289
Iterator.register(tuple_iterator)
240290
Iterator.register(zip_iterator)
241291

242292

293+
class Reversible(Iterable):
294+
295+
__slots__ = ()
296+
297+
@abstractmethod
298+
def __reversed__(self):
299+
while False:
300+
yield None
301+
302+
@classmethod
303+
def __subclasshook__(cls, C):
304+
if cls is Reversible:
305+
return _check_methods(C, "__reversed__", "__iter__")
306+
return NotImplemented
307+
308+
243309
class Generator(Iterator):
244310

245311
__slots__ = ()
@@ -283,17 +349,10 @@ def close(self):
283349
@classmethod
284350
def __subclasshook__(cls, C):
285351
if cls is Generator:
286-
mro = C.__mro__
287-
for method in ('__iter__', '__next__', 'send', 'throw', 'close'):
288-
for base in mro:
289-
if method in base.__dict__:
290-
break
291-
else:
292-
return NotImplemented
293-
return True
352+
return _check_methods(C, '__iter__', '__next__',
353+
'send', 'throw', 'close')
294354
return NotImplemented
295355

296-
297356
Generator.register(generator)
298357

299358

@@ -308,8 +367,7 @@ def __len__(self):
308367
@classmethod
309368
def __subclasshook__(cls, C):
310369
if cls is Sized:
311-
if any("__len__" in B.__dict__ for B in C.__mro__):
312-
return True
370+
return _check_methods(C, "__len__")
313371
return NotImplemented
314372

315373

@@ -324,10 +382,18 @@ def __contains__(self, x):
324382
@classmethod
325383
def __subclasshook__(cls, C):
326384
if cls is Container:
327-
if any("__contains__" in B.__dict__ for B in C.__mro__):
328-
return True
385+
return _check_methods(C, "__contains__")
329386
return NotImplemented
330387

388+
class Collection(Sized, Iterable, Container):
389+
390+
__slots__ = ()
391+
392+
@classmethod
393+
def __subclasshook__(cls, C):
394+
if cls is Collection:
395+
return _check_methods(C, "__len__", "__iter__", "__contains__")
396+
return NotImplemented
331397

332398
class Callable(metaclass=ABCMeta):
333399

@@ -340,15 +406,14 @@ def __call__(self, *args, **kwds):
340406
@classmethod
341407
def __subclasshook__(cls, C):
342408
if cls is Callable:
343-
if any("__call__" in B.__dict__ for B in C.__mro__):
344-
return True
409+
return _check_methods(C, "__call__")
345410
return NotImplemented
346411

347412

348413
### SETS ###
349414

350415

351-
class Set(Sized, Iterable, Container):
416+
class Set(Collection):
352417

353418
"""A set is a finite, iterable container.
354419
@@ -573,7 +638,7 @@ def __isub__(self, it):
573638
### MAPPINGS ###
574639

575640

576-
class Mapping(Sized, Iterable, Container):
641+
class Mapping(Collection):
577642

578643
__slots__ = ()
579644

@@ -621,6 +686,8 @@ def __eq__(self, other):
621686
return NotImplemented
622687
return dict(self.items()) == dict(other.items())
623688

689+
__reversed__ = None
690+
624691
Mapping.register(mappingproxy)
625692

626693

@@ -670,7 +737,7 @@ def __contains__(self, item):
670737
except KeyError:
671738
return False
672739
else:
673-
return v == value
740+
return v is value or v == value
674741

675742
def __iter__(self):
676743
for key in self._mapping:
@@ -685,7 +752,8 @@ class ValuesView(MappingView):
685752

686753
def __contains__(self, value):
687754
for key in self._mapping:
688-
if value == self._mapping[key]:
755+
v = self._mapping[key]
756+
if v is value or v == value:
689757
return True
690758
return False
691759

@@ -794,7 +862,7 @@ def setdefault(self, key, default=None):
794862
### SEQUENCES ###
795863

796864

797-
class Sequence(Sized, Iterable, Container):
865+
class Sequence(Reversible, Collection):
798866

799867
"""All the operations on a read-only sequence.
800868
@@ -820,7 +888,7 @@ def __iter__(self):
820888

821889
def __contains__(self, value):
822890
for v in self:
823-
if v == value:
891+
if v is value or v == value:
824892
return True
825893
return False
826894

‎addons/source-python/Python3/_compat_pickle.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@
177177
'DocXMLRPCServer': 'xmlrpc.server',
178178
'SimpleHTTPServer': 'http.server',
179179
'CGIHTTPServer': 'http.server',
180+
# For compatibility with broken pickles saved in old Python 3 versions
181+
'UserDict': 'collections',
182+
'UserList': 'collections',
183+
'UserString': 'collections',
184+
'whichdb': 'dbm',
185+
'StringIO': 'io',
186+
'cStringIO': 'io',
180187
})
181188

182189
REVERSE_IMPORT_MAPPING.update({
@@ -235,3 +242,10 @@
235242

236243
for excname in PYTHON3_OSERROR_EXCEPTIONS:
237244
REVERSE_NAME_MAPPING[('builtins', excname)] = ('exceptions', 'OSError')
245+
246+
PYTHON3_IMPORTERROR_EXCEPTIONS = (
247+
'ModuleNotFoundError',
248+
)
249+
250+
for excname in PYTHON3_IMPORTERROR_EXCEPTIONS:
251+
REVERSE_NAME_MAPPING[('builtins', excname)] = ('exceptions', 'ImportError')

0 commit comments

Comments
 (0)