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

python_minifier/__init__.py

@@ -86,7 +86,8 @@ def minify(
     :param str source: The python module source code
     :param str filename: The original source filename if known
 
-    :param remove_annotations: Configures the removal of type annotations. True removes all annotations, False removes none. RemoveAnnotationsOptions can be used to configure the removal of specific annotations.
+    :param remove_annotations: Configures the removal of type annotations. True removes all annotations, False removes none.
+        RemoveAnnotationsOptions can be used to configure the removal of specific annotations.
     :type remove_annotations: bool or RemoveAnnotationsOptions
     :param bool remove_pass: If Pass statements should be removed where possible
     :param bool remove_literal_statements: If statements consisting of a single literal should be removed, including docstrings

python_minifier/__init__.pyi

@@ -1,6 +1,6 @@
 import ast
 
-from typing import Any, AnyStr, List, Optional, Text, Union
+from typing import Any, List, Optional, Text, Union
 
 from .transforms.remove_annotations_options import RemoveAnnotationsOptions as RemoveAnnotationsOptions
 
@@ -10,7 +10,7 @@ class UnstableMinification(RuntimeError):
 
 
 def minify(
-    source: AnyStr,
+    source: Union[str, bytes],
     filename: Optional[str] = ...,
     remove_annotations: Union[bool, RemoveAnnotationsOptions] = ...,
     remove_pass: bool = ...,
@@ -36,7 +36,7 @@ def unparse(module: ast.Module) -> Text: ...
 
 
 def awslambda(
-    source: AnyStr,
+    source: Union[str, bytes],
     filename: Optional[Text] = ...,
     entrypoint: Optional[Text] = ...
 ) -> Text: ...

python_minifier/__main__.py

@@ -8,6 +8,18 @@ from python_minifier import minify
 from python_minifier.transforms.remove_annotations_options import RemoveAnnotationsOptions
 
 
+class MinificationNotBeneficialError(Exception):
+    """Raised when minification results in larger output than the original."""
+    pass
+
+def stdout_write_bytes(data):
+    """Write bytes to stdout with proper Python 2.7/3.x compatibility."""
+    if sys.version_info >= (3, 0):
+        sys.stdout.buffer.write(data)
+    else:
+        sys.stdout.write(data)
+
+
 if sys.version_info >= (3, 8):
     from importlib import metadata
 
@@ -51,12 +63,23 @@ examples:
     if len(args.path) == 1 and args.path[0] == '-':
         # minify stdin
         source = sys.stdin.buffer.read() if sys.version_info >= (3, 0) else sys.stdin.read()
-        minified = do_minify(source, 'stdin', args)
+        try:
+            minified = do_minify(source, 'stdin', args)
+        except MinificationNotBeneficialError:
+            # Use original source when minification isn't beneficial
+            if args.output:
+                with open(args.output, 'wb') as f:
+                    f.write(source)
+            else:
+                # Write original source to stdout
+                stdout_write_bytes(source)
+            return
+
         if args.output:
-            with open(args.output, 'w') as f:
+            with open(args.output, 'wb') as f:
                 f.write(minified)
         else:
-            sys.stdout.write(minified)
+            stdout_write_bytes(minified)
 
     else:
         # minify source paths
@@ -67,16 +90,30 @@ examples:
             with open(path, 'rb') as f:
                 source = f.read()
 
-            minified = do_minify(source, path, args)
+            try:
+                minified = do_minify(source, path, args)
+            except MinificationNotBeneficialError:
+                # Use original source when minification isn't beneficial
+                if args.in_place:
+                    # File is already the original, no need to write
+                    pass
+                elif args.output:
+                    # Write original source to output
+                    with open(args.output, 'wb') as f:
+                        f.write(source)
+                else:
+                    # Write original source to stdout
+                    stdout_write_bytes(source)
+                continue
 
             if args.in_place:
-                with open(path, 'w') as f:
+                with open(path, 'wb') as f:
                     f.write(minified)
             elif args.output:
-                with open(args.output, 'w') as f:
+                with open(args.output, 'wb') as f:
                     f.write(minified)
             else:
-                sys.stdout.write(minified)
+                stdout_write_bytes(minified)
 
 
 def parse_args():
@@ -280,6 +317,15 @@ def source_modules(args):
 
 
 def do_minify(source, filename, minification_args):
+    """Minify Python source code with size-based fallback.
+
+    :param bytes source: Source code as bytes (from file 'rb' or stdin.buffer)
+    :param str filename: Filename for error reporting
+    :param argparse.Namespace minification_args: CLI arguments for minification options
+    :returns: Minified source code as UTF-8 bytes
+    :rtype: bytes
+    :raises MinificationNotBeneficialError: When minified output is larger than original
+    """
 
     preserve_globals = []
     if minification_args.preserve_globals:
@@ -308,7 +354,7 @@ def do_minify(source, filename, minification_args):
             remove_class_attribute_annotations=minification_args.remove_class_attribute_annotations,
         )
 
-    return minify(
+    minified_result = minify(
         source,
         filename=filename,
         combine_imports=minification_args.combine_imports,
@@ -330,6 +376,19 @@ def do_minify(source, filename, minification_args):
         constant_folding=minification_args.constant_folding
     )
 
+    # Encode minified result to bytes for comparison and output
+    minified_bytes = minified_result.encode('utf-8')
+
+    # Check if environment variable forces minified output
+    if os.environ.get('PYMINIFY_FORCE_BEST_EFFORT'):
+        return minified_bytes
+
+    # Compare byte lengths for accurate size comparison
+    if len(minified_bytes) > len(source):
+        raise MinificationNotBeneficialError("Minified output is longer than original")
+
+    return minified_bytes
+
 
 if __name__ == '__main__':
     main()

python_minifier/ast_compare.py

@@ -77,26 +77,26 @@ def compare_ast(l_ast, r_ast):
                     % (type(l_ast), field, len(l_list), type(r_ast), field, len(r_list)),
                 )
 
-            for i, l, r in zip(counter(), l_list, r_list):
-                if isinstance(l, ast.AST) or isinstance(r, ast.AST):
-                    compare_ast(l, r)
-                elif l != r:
+            for i, left, right in zip(counter(), l_list, r_list):
+                if isinstance(left, ast.AST) or isinstance(right, ast.AST):
+                    compare_ast(left, right)
+                elif left != right:
                     raise CompareError(
                         l_ast,
                         r_ast,
                         'Fields do not match! %s.%s[%i]=%r, %s.%s[%i]=%r'
-                        % (type(l_ast), field, i, l, type(r_ast), field, i, r),
+                        % (type(l_ast), field, i, left, type(r_ast), field, i, right),
                     )
 
         else:
-            l = getattr(l_ast, field, None)
-            r = getattr(r_ast, field, None)
+            left_field = getattr(l_ast, field, None)
+            right_field = getattr(r_ast, field, None)
 
-            if isinstance(l, ast.AST) or isinstance(r, ast.AST):
-                compare_ast(l, r)
-            elif l != r:
+            if isinstance(left_field, ast.AST) or isinstance(right_field, ast.AST):
+                compare_ast(left_field, right_field)
+            elif left_field != right_field:
                 raise CompareError(
                     l_ast,
                     r_ast,
-                    'Fields do not match! %s.%s=%r, %s.%s=%r' % (type(l_ast), field, l, type(r_ast), field, r),
+                    'Fields do not match! %s.%s=%r, %s.%s=%r' % (type(l_ast), field, left_field, type(r_ast), field, right_field),
                 )

python_minifier/f_string.py

@@ -272,31 +272,31 @@ class Str(object):
         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 == '':
@@ -315,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)
@@ -399,23 +399,23 @@ class Bytes(object):
         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'':
@@ -434,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/module_printer.py

@@ -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
 

python_minifier/token_printer.py

@@ -91,7 +91,11 @@ class TokenPrinter(object):
         self._prefer_single_line = prefer_single_line
         self._allow_invalid_num_warnings = allow_invalid_num_warnings
 
-        self._code = ''
+        # Initialize as unicode string on Python 2.7 to handle Unicode content
+        if sys.version_info[0] < 3:
+            self._code = u''
+        else:
+            self._code = ''
         self.indent = 0
         self.unicode_literals = False
         self.previous_token = TokenTypes.NoToken
@@ -99,6 +103,10 @@ class TokenPrinter(object):
     def __str__(self):
         """Return the output code."""
         return self._code
+    
+    def __unicode__(self):
+        """Return the output code as unicode (for Python 2.7 compatibility)."""
+        return self._code
 
     def identifier(self, name):
         """Add an identifier to the output code."""

{python_minifier-2.11.3.dist-info → python_minifier-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-minifier
-Version: 2.11.3
+Version: 3.0.0
 Summary: Transform Python source code into it's most compact representation
 Home-page: https://github.com/dflook/python-minifier
 Author: Daniel Flook
@@ -130,7 +130,7 @@ def handler(event,context):
 
 ## Why?
 
-AWS Cloudformation templates may have AWS lambda function source code embedded in them, but only if the function is less 
+AWS Cloudformation templates may have AWS lambda function source code embedded in them, but only if the function is less
 than 4KiB. I wrote this package so I could write python normally and still embed the module in a template.
 
 ## Installation

{python_minifier-2.11.3.dist-info → python_minifier-3.0.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-python_minifier/__init__.py,sha256=UFi9vjNWyaNkXGyf_lssc261mdf5W_bMOiEZTGXYHb0,9534
-python_minifier/__init__.pyi,sha256=NmY5y1_tM0WaUUcmGOEld_UHj-VHqO_c_d9SkDiQY6k,1219
-python_minifier/__main__.py,sha256=RKeTffRWvexlVuVZZTjVQcN2sH7yEgZA-6S1JD8A4xI,11773
-python_minifier/ast_compare.py,sha256=76iOfa2fA8zMeiRscijFr4n7PVbe3SNOLQ6adXFGtZs,3119
+python_minifier/__init__.py,sha256=Q95ufDbd7hadjVtJZYclsJqX9S4NsKZSpqCui0Fw7oI,9542
+python_minifier/__init__.pyi,sha256=-xLoKXbQsV7ko_YzyXL9WkI2vmGc6yn4AW5biK_GJXE,1233
+python_minifier/__main__.py,sha256=r7_Vh9n-aoc4jd5CERKO3KqJeqXHeWoycDRlvV7xTFM,14053
+python_minifier/ast_compare.py,sha256=TlkEdQyiEXZZxbu3NrOgmYE7d8nV8dYhHDMysni44-Q,3249
 python_minifier/ast_compat.py,sha256=nubno_yFHtuoxbT7a7CtlcAfdNj9yhniKSfNoOsQ3Fw,2209
 python_minifier/ast_printer.py,sha256=TlkyKl9_9ScWeop3W1TwXZ46MJWINfkJ7NvmULpwt4A,3254
 python_minifier/expression_printer.py,sha256=AwkDTs-NJhLyDppE_zlgQdtQQTVQlxdOdgTtSt_DxT8,22465
-python_minifier/f_string.py,sha256=CWGjip5uPvhAQ_gUof1R1eA0Dfko6ce6iAyqZATJ-JI,13945
+python_minifier/f_string.py,sha256=9Zkb2SksoTdx0-dfQKy_Q76KrOR4cxPokR5tnF7jldY,14131
 python_minifier/ministring.py,sha256=R0xaAZqMlLu1Jm0aBVSI0n8KZiZV7PTs4RE4UbCmTy8,4359
-python_minifier/module_printer.py,sha256=43vnyEe4VjKM6IqIKmmSflF9GWJPxOp5ANCe31Do350,25268
+python_minifier/module_printer.py,sha256=CZFZ3WDBgH57_Q2pmC0ySFdRcvQR_7uVQeXKfvT1BN0,25566
 python_minifier/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_minifier/token_printer.py,sha256=UXOv2f-sg4gDpNLVbBLGrQsuLEiiovLXxP2izwdJOyg,9340
+python_minifier/token_printer.py,sha256=TbN7VDGM_icmruLnBLgtWpHz1iY4pagGKsWCBMWSisA,9640
 python_minifier/util.py,sha256=60iT3XkKlPlZhXQ1NuLB27Wv3ihl-gBC_WjOjEiFn-Q,1184
 python_minifier/ast_annotation/__init__.py,sha256=BJ4gyS-_bytIZf0SP8JJG6FECWf8MUaUi3vOAfD60qQ,2259
 python_minifier/rename/__init__.py,sha256=8DLEFgliakf_5T_m-l1Nd35QxKpM4h7RJyFVpjsxjWA,375
@@ -36,10 +36,10 @@ python_minifier/transforms/remove_object_base.py,sha256=j4se6OXyZK1lr_ABmGT0Oivu
 python_minifier/transforms/remove_pass.py,sha256=S9e59nBEZ8rBBifvAhbPRDTfUA7s8_a7pSIsZbFZD2A,735
 python_minifier/transforms/remove_posargs.py,sha256=aV0wFnGiDXu4uQBQP7-cB1uLSF3mamIq5-txvDg8BVo,314
 python_minifier/transforms/suite_transformer.py,sha256=WZCVkkBSniWeEtBybVweeMmy-A1wC3lBIYSgxCHelBU,6324
-python_minifier-2.11.3.dist-info/LICENSE,sha256=FzsyDHb8pAZupSGFjIOuHcHMlFf6N-aIxq9gOYGbNyE,1069
-python_minifier-2.11.3.dist-info/METADATA,sha256=ABQoEpnuJclsz6POoi8W-9JvmF8YiVcCiDBcyBYjfPY,6453
-python_minifier-2.11.3.dist-info/WHEEL,sha256=1VPi6hfNQaRRNuEdK_3dv9o8COtLGnHWJghhj4CQ28k,92
-python_minifier-2.11.3.dist-info/entry_points.txt,sha256=aS7ZUWQeeys8lAbrmmEa2__Bg-anH1tUMyi9cKdTbO4,60
-python_minifier-2.11.3.dist-info/top_level.txt,sha256=4SRDfWKi_KMq7LDrjlzUFoDCs6INYPtxc1Pun4z8LsU,16
-python_minifier-2.11.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-python_minifier-2.11.3.dist-info/RECORD,,
+python_minifier-3.0.0.dist-info/LICENSE,sha256=FzsyDHb8pAZupSGFjIOuHcHMlFf6N-aIxq9gOYGbNyE,1069
+python_minifier-3.0.0.dist-info/METADATA,sha256=qyng9Qp0kOp9hiup4wcfJW2DQJT3_hCjbFemSrIpTpU,6451
+python_minifier-3.0.0.dist-info/WHEEL,sha256=1VPi6hfNQaRRNuEdK_3dv9o8COtLGnHWJghhj4CQ28k,92
+python_minifier-3.0.0.dist-info/entry_points.txt,sha256=aS7ZUWQeeys8lAbrmmEa2__Bg-anH1tUMyi9cKdTbO4,60
+python_minifier-3.0.0.dist-info/top_level.txt,sha256=4SRDfWKi_KMq7LDrjlzUFoDCs6INYPtxc1Pun4z8LsU,16
+python_minifier-3.0.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+python_minifier-3.0.0.dist-info/RECORD,,