Skip to content

Commit cd61c58

Browse files
authored
Update six to 1.13.0 (#219)
1 parent 42f20a8 commit cd61c58

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

shotgun_api3/lib/six.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2010-2018 Benjamin Peterson
1+
# Copyright (c) 2010-2019 Benjamin Peterson
22
#
33
# Permission is hereby granted, free of charge, to any person obtaining a copy
44
# of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
2929
import types
3030

3131
__author__ = "Benjamin Peterson <benjamin@python.org>"
32-
__version__ = "1.12.0"
32+
__version__ = "1.13.0"
3333

3434

3535
# Useful for very coarse version differentiation.
@@ -255,8 +255,10 @@ class _MovedItems(_LazyModule):
255255
MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
256256
MovedModule("builtins", "__builtin__"),
257257
MovedModule("configparser", "ConfigParser"),
258+
MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"),
258259
MovedModule("copyreg", "copy_reg"),
259260
MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
261+
MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
260262
MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
261263
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
262264
MovedModule("http_cookies", "Cookie", "http.cookies"),
@@ -825,7 +827,15 @@ def with_metaclass(meta, *bases):
825827
class metaclass(type):
826828

827829
def __new__(cls, name, this_bases, d):
828-
return meta(name, bases, d)
830+
if sys.version_info[:2] >= (3, 7):
831+
# This version introduced PEP 560 that requires a bit
832+
# of extra care (we mimic what is done by __build_class__).
833+
resolved_bases = types.resolve_bases(bases)
834+
if resolved_bases is not bases:
835+
d['__orig_bases__'] = bases
836+
else:
837+
resolved_bases = bases
838+
return meta(name, resolved_bases, d)
829839

830840
@classmethod
831841
def __prepare__(cls, name, this_bases):

0 commit comments

Comments
 (0)