1616
1717# Standard Library
1818import ast
19- import collections
2019import distutils .errors
2120import os .path
2221import shutil
3837except ImportError :
3938 cythonize = None
4039
41-
4240PACKAGE_NAME = "threaded"
4341
4442with open (os .path .join (os .path .dirname (__file__ ), PACKAGE_NAME , "__init__.py" )) as f :
5250
5351
5452# noinspection PyCallingNonCallable
55- if cythonize is not None and "win32" != sys . platform :
53+ if cythonize is not None :
5654 REQUIRES_OPTIMIZATION = [
5755 setuptools .Extension ("threaded.class_decorator" , ["threaded/class_decorator.pyx" ]),
5856 setuptools .Extension ("threaded._base_threaded" , ["threaded/_base_threaded.py" ]),
5957 setuptools .Extension ("threaded._asynciotask" , ["threaded/_asynciotask.pyx" ]),
6058 setuptools .Extension ("threaded._threaded" , ["threaded/_threaded.pyx" ]),
6159 setuptools .Extension ("threaded._threadpooled" , ["threaded/_threadpooled.py" ]),
62- setuptools . Extension ( "threaded.__init__" , [ "threaded/__init__.pyx" ]),
60+
6361 ]
62+ if "win32" != sys .platform :
63+ # NOTE: Do not make pyx/pxd - it kills windows
64+ REQUIRES_OPTIMIZATION .append (setuptools .Extension ("threaded.__init__" , ["threaded/__init__.py" ]),)
65+
6466 INTERFACES = ["class_decorator.pxd" , "_asynciotask.pxd" , "_threaded.pxd" ]
6567
6668 EXT_MODULES = cythonize (
@@ -104,7 +106,7 @@ def run(self):
104106 shutil .copyfile (src , dst )
105107 except (
106108 distutils .errors .DistutilsPlatformError ,
107- getattr ( globals ()[ "__builtins__" ], " FileNotFoundError" , OSError ) ,
109+ FileNotFoundError ,
108110 ):
109111 raise BuildFailed ()
110112
@@ -127,7 +129,7 @@ def build_extension(self, ext):
127129# noinspection PyUnresolvedReferences
128130def get_simple_vars_from_src (
129131 src : str
130- ) -> "typing.Dict[str, typing.Union[str, bytes, int, float, complex, list, set, dict, tuple, None]]" :
132+ ) -> "typing.Dict[str, typing.Union[str, bytes, int, float, complex, list, set, dict, tuple, None, bool, Ellipsis ]]" :
131133 """Get simple (string/number/boolean and None) assigned values from source.
132134
133135 :param src: Source code
@@ -139,7 +141,7 @@ def get_simple_vars_from_src(
139141 str, bytes,
140142 int, float, complex,
141143 list, set, dict, tuple,
142- None,
144+ None, bool, Ellipsis
143145 ]
144146 ]
145147
@@ -152,32 +154,33 @@ def get_simple_vars_from_src(
152154
153155 >>> string_sample = "a = '1'"
154156 >>> get_simple_vars_from_src(string_sample)
155- OrderedDict([( 'a', '1')])
157+ { 'a': '1'}
156158
157159 >>> int_sample = "b = 1"
158160 >>> get_simple_vars_from_src(int_sample)
159- OrderedDict([( 'b', 1)])
161+ { 'b': 1}
160162
161163 >>> list_sample = "c = [u'1', b'1', 1, 1.0, 1j, None]"
162164 >>> result = get_simple_vars_from_src(list_sample)
163- >>> result == collections.OrderedDict(
164- ... [('c', [u'1', b'1', 1, 1.0, 1j, None])]
165- ... )
165+ >>> result == {'c': [u'1', b'1', 1, 1.0, 1j, None]}
166166 True
167167
168168 >>> iterable_sample = "d = ([1], {1: 1}, {1})"
169169 >>> get_simple_vars_from_src(iterable_sample)
170- OrderedDict([( 'd', ([1], {1: 1}, {1}))])
170+ { 'd': ([1], {1: 1}, {1})}
171171
172172 >>> multiple_assign = "e = f = g = 1"
173173 >>> get_simple_vars_from_src(multiple_assign)
174- OrderedDict([( 'e', 1), ( 'f', 1), ( 'g', 1)])
174+ { 'e': 1, 'f': 1, 'g': 1}
175175 """
176- ast_data = (ast .Str , ast .Num , ast .List , ast .Set , ast .Dict , ast .Tuple , ast .Bytes , ast .NameConstant )
176+ if sys .version_info [:2 ] < (3 , 8 ):
177+ ast_data = (ast .Str , ast .Num , ast .List , ast .Set , ast .Dict , ast .Tuple , ast .Bytes , ast .NameConstant , ast .Ellipsis )
178+ else :
179+ ast_data = ast .Constant
177180
178181 tree = ast .parse (src )
179182
180- result = collections . OrderedDict ()
183+ result = {}
181184
182185 for node in ast .iter_child_nodes (tree ):
183186 if not isinstance (node , ast .Assign ): # We parse assigns only
0 commit comments