Bug fix for Python 3.5

scnerd · Apr 25, 2018 · 6a155cb · 6a155cb
1 parent dc11e83
commit 6a155cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pragma/collapse_literals.py b/pragma/collapse_literals.py
@@ -1,6 +1,6 @@
 import ast
 
-from .core import TrackedContextTransformer, make_function_transformer, primitive_types
+from .core import TrackedContextTransformer, make_function_transformer, primitive_ast_types
 import logging
 log = logging.getLogger(__name__)
 
@@ -9,7 +9,7 @@
 class CollapseTransformer(TrackedContextTransformer):
     def visit_Name(self, node):
         res = self.resolve_literal(node)
-        if isinstance(res, (ast.Num, ast.Str, ast.JoinedStr, ast.Bytes, ast.NameConstant, ast.Constant)):
+        if isinstance(res, primitive_ast_types):
             return res
         return node
 

diff --git a/pragma/core/resolve/__init__.py b/pragma/core/resolve/__init__.py
@@ -89,6 +89,11 @@ def resolve_name_or_attribute(node, ctxt):
 
 primitive_types = tuple([str, bytes, bool, type(None)] + list(num_types) + list(float_types))
 
+try:
+    primitive_ast_types = (ast.Num, ast.Str, ast.Bytes, ast.NameConstant, ast.Constant, ast.JoinedStr)
+except AttributeError:  # Python <3.6
+    primitive_ast_types = (ast.Num, ast.Str, ast.Bytes, ast.NameConstant, ast.Constant)
+
 
 def make_binop(op):
     def f(self, other):