python-minifier 2.11.2__py2-none-any.whl → 3.0.0__py2-none-any.whl

python_minifier/f_string.py

@@ -6,17 +6,17 @@ Mostly because FStrings feel like a hack.
 
 """
 
-import python_minifier.ast_compat as ast
 import copy
 import re
 
+import python_minifier.ast_compat as ast
+
 from python_minifier import UnstableMinification
-from python_minifier.ast_compare import CompareError
-from python_minifier.ast_compare import compare_ast
+from python_minifier.ast_compare import CompareError, compare_ast
 from python_minifier.expression_printer import ExpressionPrinter
 from python_minifier.ministring import MiniString
 from python_minifier.token_printer import TokenTypes
-from python_minifier.util import is_ast_node
+from python_minifier.util import is_constant_node
 
 
 class FString(object):
@@ -36,7 +36,7 @@ class FString(object):
             c = ast.parse(code, 'FString candidate', mode='eval')
             compare_ast(self.node, c.body)
             return True
-        except Exception as e:
+        except Exception:
             return False
 
     def complete_debug_specifier(self, partial_specifier_candidates, value_node):
@@ -70,7 +70,7 @@ class FString(object):
                 nested_allowed.remove(quote)
 
             for v in self.node.values:
-                if is_ast_node(v, ast.Str):
+                if is_constant_node(v, ast.Str):
 
                     # Could this be used as a debug specifier?
                     if len(candidates) < 10:
@@ -79,12 +79,12 @@ class FString(object):
                             # Maybe!
                             try:
                                 debug_specifier_candidates = [x + '{' + v.s for x in candidates]
-                            except Exception as e:
+                            except Exception:
                                 continue
 
                     try:
                         candidates = [x + self.str_for(v.s, quote) for x in candidates]
-                    except Exception as e:
+                    except Exception:
                         continue
                 elif isinstance(v, ast.FormattedValue):
                     try:
@@ -93,15 +93,14 @@ class FString(object):
                             x + y for x in candidates for y in FormattedValue(v, nested_allowed, self.pep701).get_candidates()
                         ] + completed
                         debug_specifier_candidates = []
-                    except Exception as e:
+                    except Exception:
                         continue
                 else:
                     raise RuntimeError('Unexpected JoinedStr value')
 
                 actual_candidates += ['f' + quote + x + quote for x in candidates]
 
-        actual_candidates = filter(self.is_correct_ast, actual_candidates)
-        return actual_candidates
+        return filter(self.is_correct_ast, actual_candidates)
 
     def str_for(self, s, quote):
         return s.replace('{', '{{').replace('}', '}}')
@@ -270,34 +269,34 @@ class Str(object):
             elif c != quote:
                 return quote
 
-        raise ValueError('Couldn\'t find a quote')
+        raise ValueError("Couldn't find a quote")
 
     def _literals(self):
-        l = ''
+        literal = ''
         for c in self._s:
             if not self._can_quote(c):
-                if l:
-                    l += self.current_quote
-                    yield l
-                    l = ''
+                if literal:
+                    literal += self.current_quote
+                    yield literal
+                    literal = ''
 
                 self.current_quote = self._get_quote(c)
 
-            if l == '':
-                l += self.current_quote
+            if literal == '':
+                literal += self.current_quote
 
             if c == '\n':
-                l += '\\n'
+                literal += '\\n'
             elif c == '\r':
-                l += '\\r'
+                literal += '\\r'
             elif c == '\\':
-                l += '\\\\'
+                literal += '\\\\'
             else:
-                l += c
+                literal += c
 
-        if l:
-            l += self.current_quote
-            yield l
+        if literal:
+            literal += self.current_quote
+            yield literal
 
     def __str__(self):
         if self._s == '':
@@ -316,10 +315,10 @@ class Str(object):
         for start_quote in self.allowed_quotes:
             self.current_quote = start_quote
             s = ''
-            for l in self._literals():
-                if s and s[-1] == l[0]:
+            for literal in self._literals():
+                if s and s[-1] == literal[0]:
                     s += ' '
-                s += l
+                s += literal
 
             if eval(s) == self._s:
                 candidates.append(s)
@@ -349,7 +348,7 @@ class FormatSpec(object):
 
         candidates = ['']
         for v in self.node.values:
-            if is_ast_node(v, ast.Str):
+            if is_constant_node(v, ast.Str):
                 candidates = [x + self.str_for(v.s) for x in candidates]
             elif isinstance(v, ast.FormattedValue):
                 candidates = [
@@ -397,26 +396,26 @@ class Bytes(object):
             elif chr(c) != quote:
                 return quote
 
-        raise ValueError('Couldn\'t find a quote')
+        raise ValueError("Couldn't find a quote")
 
     def _literals(self):
-        l = ''
+        literal = ''
         for b in self._b:
             if not self._can_quote(b):
-                if l:
-                    l += self.current_quote
-                    yield l
-                    l = ''
+                if literal:
+                    literal += self.current_quote
+                    yield literal
+                    literal = ''
 
                 self.current_quote = self._get_quote(b)
 
-            if l == '':
-                l = 'b' + self.current_quote
-            l += chr(b)
+            if literal == '':
+                literal = 'b' + self.current_quote
+            literal += chr(b)
 
-        if l:
-            l += self.current_quote
-            yield l
+        if literal:
+            literal += self.current_quote
+            yield literal
 
     def __str__(self):
         if self._b == b'':
@@ -435,10 +434,10 @@ class Bytes(object):
         for start_quote in self.allowed_quotes:
             self.current_quote = start_quote
             s = ''
-            for l in self._literals():
-                if s and s[-1] == l[0]:
+            for literal in self._literals():
+                if s and s[-1] == literal[0]:
                     s += ' '
-                s += l
+                s += literal
 
             assert eval(s) == self._b
             candidates.append(s)

python_minifier/ministring.py

@@ -32,7 +32,7 @@ class MiniString(object):
 
         try:
             eval(self.quote + s + self.quote)
-        except (UnicodeDecodeError, UnicodeEncodeError) as e:
+        except (UnicodeDecodeError, UnicodeEncodeError):
             if self.safe_mode:
                 raise
 
@@ -63,7 +63,7 @@ class MiniString(object):
         }
 
         for c in self._s:
-            if c in escaped.keys():
+            if c in escaped:
                 s += escaped[c]
             else:
                 if self.safe_mode:
@@ -95,7 +95,7 @@ class MiniString(object):
         }
 
         for c in self._s:
-            if c in escaped.keys():
+            if c in escaped:
                 s += escaped[c]
             else:
                 if self.safe_mode:

python_minifier/module_printer.py

@@ -1,9 +1,9 @@
-import python_minifier.ast_compat as ast
 import sys
 
+import python_minifier.ast_compat as ast
+
 from .expression_printer import ExpressionPrinter
 from .token_printer import Delimiter
-from .util import is_ast_node
 
 
 class ModulePrinter(ExpressionPrinter):
@@ -28,11 +28,15 @@ class ModulePrinter(ExpressionPrinter):
         assert isinstance(module, ast.Module)
 
         self.visit_Module(module)
-        return str(self.printer).rstrip('\n' + self.indent_char + ';')
+        # On Python 2.7, preserve unicode strings to avoid encoding issues
+        code = unicode(self.printer) if sys.version_info[0] < 3 else str(self.printer)
+        return code.rstrip('\n' + self.indent_char + ';')
 
     @property
     def code(self):
-        return str(self.printer).rstrip('\n' + self.indent_char + ';')
+        # On Python 2.7, preserve unicode strings to avoid encoding issues
+        code = unicode(self.printer) if sys.version_info[0] < 3 else str(self.printer)
+        return code.rstrip('\n' + self.indent_char + ';')
 
     # region Simple Statements
 
@@ -55,7 +59,7 @@ class ModulePrinter(ExpressionPrinter):
     def visit_Expr(self, node):
         assert isinstance(node, ast.Expr)
 
-        if is_ast_node(node.value, (ast.Yield, 'YieldFrom')):
+        if isinstance(node.value, (ast.Yield, ast.YieldFrom)):
             self._yield_expr(node.value)
         else:
             self._testlist(node.value)
@@ -82,7 +86,7 @@ class ModulePrinter(ExpressionPrinter):
             self.printer.delimiter('=')
 
         # Yield nodes that are the sole node on the right hand side of an assignment do not need parens
-        if is_ast_node(node.value, (ast.Yield, 'YieldFrom')):
+        if isinstance(node.value, (ast.Yield, ast.YieldFrom)):
             self._yield_expr(node.value)
         else:
             self._testlist(node.value)
@@ -97,7 +101,7 @@ class ModulePrinter(ExpressionPrinter):
         self.printer.delimiter('=')
 
         # Yield nodes that are the sole node on the right hand side of an assignment do not need parens
-        if is_ast_node(node.value, (ast.Yield, 'YieldFrom')):
+        if isinstance(node.value, (ast.Yield, ast.YieldFrom)):
             self._yield_expr(node.value)
         else:
             self._testlist(node.value)
@@ -143,7 +147,7 @@ class ModulePrinter(ExpressionPrinter):
 
         self.printer.keyword('return')
         if isinstance(node.value, ast.Tuple):
-            if sys.version_info < (3, 8) and [n for n in node.value.elts if is_ast_node(n, 'Starred')]:
+            if sys.version_info < (3, 8) and [n for n in node.value.elts if isinstance(n, ast.Starred)]:
                 self.printer.delimiter('(')
                 self._testlist(node.value)
                 self.printer.delimiter(')')
@@ -243,7 +247,7 @@ class ModulePrinter(ExpressionPrinter):
         assert isinstance(node, ast.ImportFrom)
 
         self.printer.keyword('from')
-        for i in range(node.level):
+        for _i in range(node.level):
             self.printer.delimiter('.')
         if node.module is not None:
             self.printer.identifier(node.module)
@@ -326,7 +330,7 @@ class ModulePrinter(ExpressionPrinter):
                 self._suite(node.orelse)
 
     def visit_For(self, node, is_async=False):
-        assert isinstance(node, ast.For) or (hasattr(ast, 'AsyncFor') and isinstance(node, ast.AsyncFor))
+        assert isinstance(node, (ast.For, ast.AsyncFor))
 
         self.printer.newline()
 
@@ -362,7 +366,7 @@ class ModulePrinter(ExpressionPrinter):
             self._suite(node.orelse)
 
     def visit_Try(self, node, star=False):
-        assert is_ast_node(node, (ast.Try, 'TryStar'))
+        assert isinstance(node, (ast.Try, ast.TryStar))
 
         self.printer.newline()
         self.printer.keyword('try')
@@ -440,7 +444,7 @@ class ModulePrinter(ExpressionPrinter):
         self._suite(node.body)
 
     def visit_With(self, node, is_async=False):
-        assert is_ast_node(node, (ast.With, 'AsyncWith'))
+        assert isinstance(node, (ast.With, ast.AsyncWith))
 
         self.printer.newline()
 
@@ -469,7 +473,7 @@ class ModulePrinter(ExpressionPrinter):
         self._suite(node.body)
 
     def visit_withitem(self, node):
-        assert is_ast_node(node, ('withitem', ast.With))
+        assert isinstance(node, (ast.withitem, ast.With))
 
         self._expression(node.context_expr)
 
@@ -478,7 +482,7 @@ class ModulePrinter(ExpressionPrinter):
             self._expression(node.optional_vars)
 
     def visit_FunctionDef(self, node, is_async=False):
-        assert is_ast_node(node, (ast.FunctionDef, 'AsyncFunctionDef'))
+        assert isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
 
         self.printer.newline()
 
@@ -670,7 +674,7 @@ class ModulePrinter(ExpressionPrinter):
         for kwd, pattern in zip(node.kwd_attrs, node.kwd_patterns):
             delimiter.new_item()
 
-            self.printer.identifier(kwd)    
+            self.printer.identifier(kwd)
             self.printer.delimiter('=')
 
             self.pattern(pattern)
@@ -859,4 +863,3 @@ class ModulePrinter(ExpressionPrinter):
 
         for node in node_list:
             statements[node.__class__.__name__](node)
-

python_minifier/rename/__init__.py

@@ -3,4 +3,4 @@ from python_minifier.rename.mapper import add_namespace
 from python_minifier.rename.rename_literals import rename_literals
 from python_minifier.rename.renamer import rename
 from python_minifier.rename.resolve_names import resolve_names
-from python_minifier.rename.util import allow_rename_locals, allow_rename_globals
+from python_minifier.rename.util import allow_rename_globals, allow_rename_locals

python_minifier/rename/bind_names.py

@@ -1,7 +1,7 @@
 import python_minifier.ast_compat as ast
 
 from python_minifier.rename.binding import NameBinding
-from python_minifier.rename.util import arg_rename_in_place, get_global_namespace, get_nonlocal_namespace, builtins
+from python_minifier.rename.util import arg_rename_in_place, builtins, get_global_namespace
 from python_minifier.transforms.suite_transformer import NodeVisitor
 
 
@@ -180,6 +180,7 @@ class NameBinder(NodeVisitor):
 
         get_global_namespace(node.namespace).preserved.add(node.name)
 
+
 def bind_names(module):
     """
     Bind names to their local namespace

python_minifier/rename/binding.py

@@ -1,7 +1,6 @@
 import python_minifier.ast_compat as ast
 
 from python_minifier.rename.util import arg_rename_in_place, insert
-from python_minifier.util import is_ast_node
 
 
 class Binding(object):
@@ -105,11 +104,11 @@ class Binding(object):
                     # Python 2 Param context
                     if not arg_rename_in_place(node):
                         arg_rename = True
-            elif is_ast_node(node, (ast.ClassDef, ast.FunctionDef, 'AsyncFunctionDef')):
+            elif isinstance(node, (ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)):
                 pass
             elif isinstance(node, ast.ExceptHandler):
                 pass
-            elif is_ast_node(node, (ast.Global, 'Nonlocal')):
+            elif isinstance(node, (ast.Global, ast.Nonlocal)):
                 pass
             elif isinstance(node, ast.alias):
                 if node.asname is None:
@@ -119,22 +118,22 @@ class Binding(object):
                     pass
                 if node.kwarg == self._name:
                     pass
-            elif is_ast_node(node, 'arg'):
+            elif isinstance(node, ast.arg):
                 if not arg_rename_in_place(node):
                     arg_rename = True
 
-            elif is_ast_node(node, 'MatchAs'):
+            elif isinstance(node, ast.MatchAs):
                 if node.name is None:
                     additional_bytes += 4  # ' as '
-            elif is_ast_node(node, 'MatchStar'):
+            elif isinstance(node, ast.MatchStar):
                 pass
-            elif is_ast_node(node, 'MatchMapping'):
+            elif isinstance(node, ast.MatchMapping):
                 pass
-            elif is_ast_node(node, 'TypeVar'):
+            elif isinstance(node, ast.TypeVar):
                 pass
-            elif is_ast_node(node, 'TypeVarTuple'):
+            elif isinstance(node, ast.TypeVarTuple):
                 pass
-            elif is_ast_node(node, 'ParamSpec'):
+            elif isinstance(node, ast.ParamSpec):
                 pass
 
             else:
@@ -160,11 +159,11 @@ class Binding(object):
                         mentions += 1
                         arg_rename = True
 
-            elif is_ast_node(node, (ast.ClassDef, ast.FunctionDef, 'AsyncFunctionDef')):
+            elif isinstance(node, (ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)):
                 pass
             elif isinstance(node, ast.ExceptHandler):
                 pass
-            elif is_ast_node(node, (ast.Global, 'Nonlocal')):
+            elif isinstance(node, (ast.Global, ast.Nonlocal)):
                 pass
             elif isinstance(node, ast.alias):
                 if node.asname is None:
@@ -172,22 +171,22 @@ class Binding(object):
                     mentions += 1
             elif isinstance(node, ast.arguments):
                 pass
-            elif is_ast_node(node, 'arg'):
+            elif isinstance(node, ast.arg):
                 if not arg_rename_in_place(node):
                     mentions += 1
                     arg_rename = True
 
-            elif is_ast_node(node, 'MatchAs'):
+            elif isinstance(node, ast.MatchAs):
                 pass
-            elif is_ast_node(node, 'MatchStar'):
+            elif isinstance(node, ast.MatchStar):
                 pass
-            elif is_ast_node(node, 'MatchMapping'):
+            elif isinstance(node, ast.MatchMapping):
                 pass
-            elif is_ast_node(node, 'TypeVar'):
+            elif isinstance(node, ast.TypeVar):
                 pass
-            elif is_ast_node(node, 'TypeVarTuple'):
+            elif isinstance(node, ast.TypeVarTuple):
                 pass
-            elif is_ast_node(node, 'ParamSpec'):
+            elif isinstance(node, ast.ParamSpec):
                 pass
 
             else:
@@ -210,11 +209,11 @@ class Binding(object):
                 else:
                     # Python 2 Param context
                     arg_rename = True
-            elif is_ast_node(node, (ast.ClassDef, ast.FunctionDef, 'AsyncFunctionDef')):
+            elif isinstance(node, (ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)):
                 mentions += 1
             elif isinstance(node, ast.ExceptHandler):
                 mentions += 1
-            elif is_ast_node(node, (ast.Global, 'Nonlocal')):
+            elif isinstance(node, (ast.Global, ast.Nonlocal)):
                 mentions += len([n for n in node.names if n == self._name])
             elif isinstance(node, ast.alias):
                 mentions += 1
@@ -223,20 +222,20 @@ class Binding(object):
                     mentions += 1
                 if node.kwarg == self._name:
                     mentions += 1
-            elif is_ast_node(node, 'arg'):
+            elif isinstance(node, ast.arg):
                 arg_rename = True
 
-            elif is_ast_node(node, 'MatchAs'):
+            elif isinstance(node, ast.MatchAs):
                 mentions += 1
-            elif is_ast_node(node, 'MatchStar'):
+            elif isinstance(node, ast.MatchStar):
                 mentions += 1
-            elif is_ast_node(node, 'MatchMapping'):
+            elif isinstance(node, ast.MatchMapping):
                 mentions += 1
-            elif is_ast_node(node, 'TypeVar'):
+            elif isinstance(node, ast.TypeVar):
                 mentions += 1
-            elif is_ast_node(node, 'TypeVarTuple'):
+            elif isinstance(node, ast.TypeVarTuple):
                 mentions += 1
-            elif is_ast_node(node, 'ParamSpec'):
+            elif isinstance(node, ast.ParamSpec):
                 mentions += 1
 
             else:
@@ -273,7 +272,7 @@ class Binding(object):
 
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
     def rename(self, new_name):
         """
@@ -283,7 +282,7 @@ class Binding(object):
 
         """
 
-        raise NotImplementedError()
+        raise NotImplementedError
 
 
 class NameBinding(Binding):
@@ -362,7 +361,7 @@ class NameBinding(Binding):
                         else:
                             assert func_namespace_binding is node.namespace
 
-            elif is_ast_node(node, (ast.FunctionDef, 'AsyncFunctionDef')):
+            elif isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
                 node.name = new_name
             elif isinstance(node, ast.ClassDef):
                 node.name = new_name
@@ -371,7 +370,7 @@ class NameBinding(Binding):
                     node.asname = None
                 else:
                     node.asname = new_name
-            elif is_ast_node(node, 'arg'):
+            elif isinstance(node, ast.arg):
 
                 if arg_rename_in_place(node):
                     node.arg = new_name
@@ -384,7 +383,7 @@ class NameBinding(Binding):
 
             elif isinstance(node, ast.ExceptHandler):
                 node.name = new_name
-            elif is_ast_node(node, (ast.Global, 'Nonlocal')):
+            elif isinstance(node, (ast.Global, ast.Nonlocal)):
                 node.names = [new_name if n == self._name else n for n in node.names]
             elif isinstance(node, ast.arguments):
 
@@ -398,17 +397,17 @@ class NameBinding(Binding):
                     node.kwarg = new_name
                     node.kwarg_renamed = True
 
-            elif is_ast_node(node, 'MatchAs'):
+            elif isinstance(node, ast.MatchAs):
                 node.name = new_name
-            elif is_ast_node(node, 'MatchStar'):
+            elif isinstance(node, ast.MatchStar):
                 node.name = new_name
-            elif is_ast_node(node, 'MatchMapping'):
+            elif isinstance(node, ast.MatchMapping):
                 node.rest = new_name
-            elif is_ast_node(node, 'TypeVar'):
+            elif isinstance(node, ast.TypeVar):
                 node.name = new_name
-            elif is_ast_node(node, 'TypeVarTuple'):
+            elif isinstance(node, ast.TypeVarTuple):
                 node.name = new_name
-            elif is_ast_node(node, 'ParamSpec'):
+            elif isinstance(node, ast.ParamSpec):
                 node.name = new_name
 
         if func_namespace_binding is not None:
@@ -492,4 +491,4 @@ class BuiltinBinding(NameBinding):
             if not isinstance(node.ctx, ast.Load):
                 return True
 
-        return False
+        return False