python-minifier 3.3.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

python_minifier/expression_printer.py

@@ -524,9 +524,15 @@ class ExpressionPrinter(object):
 
     def visit_DictComp(self, node):
         self.printer.delimiter('{')
-        self._expression(node.key)
-        self.printer.delimiter(':')
-        self._expression(node.value)
+
+        if node.value is None:
+            self.printer.operator('**')
+            self._expression(node.key)
+        else:
+            self._expression(node.key)
+            self.printer.delimiter(':')
+            self._expression(node.value)
+
         [self.visit_comprehension(x) for x in node.generators]
         self.printer.delimiter('}')
 

python_minifier/module_printer.py

@@ -234,6 +234,8 @@ class ModulePrinter(ExpressionPrinter):
     def visit_Import(self, node):
         assert isinstance(node, ast.Import)
 
+        if getattr(node, 'is_lazy', 0) == 1:
+            self.printer.keyword('lazy')
         self.printer.keyword('import')
 
         delimiter = Delimiter(self.printer)
@@ -246,6 +248,9 @@ class ModulePrinter(ExpressionPrinter):
     def visit_ImportFrom(self, node):
         assert isinstance(node, ast.ImportFrom)
 
+        if getattr(node, 'is_lazy', 0) == 1:
+            self.printer.keyword('lazy')
+
         self.printer.keyword('from')
         for _i in range(node.level):
             self.printer.delimiter('.')

python_minifier/rename/mapper.py

@@ -104,7 +104,9 @@ def add_parent_to_comprehension(node, namespace):
         add_parent(node.elt, namespace=node)
     elif hasattr(node, 'key'):
         add_parent(node.key, namespace=node)
-        add_parent(node.value, namespace=node)
+
+        if node.value is not None:
+            add_parent(node.value, namespace=node)
 
     iter_namespace = namespace
     for generator in node.generators:

python_minifier/token_printer.py

@@ -130,7 +130,7 @@ class TokenPrinter(object):
             'or', 'pass', 'raise', 'return',
             'try', 'while', 'with', 'yield', '_',
             'case', 'match', 'print', 'exec',
-            'type'
+            'type', 'lazy'
         ]
 
         if self.previous_token in [TokenTypes.Identifier, TokenTypes.Keyword, TokenTypes.SoftKeyword, TokenTypes.NumberLiteral]:
@@ -138,7 +138,7 @@ class TokenPrinter(object):
 
         self._code += kw
 
-        if kw in ['_', 'case', 'match', 'type']:
+        if kw in ['_', 'case', 'match', 'type', 'lazy']:
             self.previous_token = TokenTypes.SoftKeyword
         else:
             self.previous_token = TokenTypes.Keyword

python_minifier/transforms/combine_imports.py

@@ -3,6 +3,13 @@ import python_minifier.ast_compat as ast
 from python_minifier.transforms.suite_transformer import SuiteTransformer
 
 
+def import_kwargs(import_node):
+    lazy = getattr(import_node, 'is_lazy', None)
+    if lazy is None:
+        return {}
+    return {'is_lazy': lazy}
+
+
 class CombineImports(SuiteTransformer):
     """
     Combine multiple import statements where possible
@@ -13,29 +20,49 @@ class CombineImports(SuiteTransformer):
 
     def _combine_import(self, node_list, parent):
 
+        prev_import = None
         alias = []
-        namespace = None
+
+        def can_merge_with_previous_group(statement):
+            if not isinstance(statement, ast.Import):
+                return False
+
+            if prev_import is None:
+                return True
+
+            if getattr(statement, 'is_lazy', None) != getattr(prev_import, 'is_lazy', None):
+                return False
+
+            return True
+
+        def can_create_group(statement):
+            return isinstance(statement, ast.Import)
 
         for statement in node_list:
-            namespace = statement.namespace
-            if isinstance(statement, ast.Import):
+            if can_merge_with_previous_group(statement):
+                prev_import = statement
                 alias += statement.names
             else:
                 if alias:
-                    yield self.add_child(ast.Import(names=alias), parent=parent, namespace=namespace)
+                    yield self.add_child(ast.Import(names=alias, **import_kwargs(prev_import)), parent=parent, namespace=prev_import.namespace)
+                    prev_import = None
                     alias = []
 
-                yield statement
+                if can_create_group(statement):
+                    prev_import = statement
+                    alias += statement.names
+                else:
+                    yield statement
 
         if alias:
-            yield self.add_child(ast.Import(names=alias), parent=parent, namespace=namespace)
+            yield self.add_child(ast.Import(names=alias, **import_kwargs(prev_import)), parent=parent, namespace=prev_import.namespace)
 
     def _combine_import_from(self, node_list, parent):
 
         prev_import = None
         alias = []
 
-        def combine(statement):
+        def can_merge_with_previous_group(statement):
             if not isinstance(statement, ast.ImportFrom):
                 return False
 
@@ -45,27 +72,44 @@ class CombineImports(SuiteTransformer):
             if prev_import is None:
                 return True
 
+            if getattr(statement, 'is_lazy', None) != getattr(prev_import, 'is_lazy', None):
+                return False
+
             if statement.module == prev_import.module and statement.level == prev_import.level:
                 return True
 
             return False
 
+        def can_create_group(statement):
+            if not isinstance(statement, ast.ImportFrom):
+                return False
+
+            if len(statement.names) == 1 and statement.names[0].name == '*':
+                return False
+
+            return True
+
         for statement in node_list:
-            if combine(statement):
+            if can_merge_with_previous_group(statement):
                 prev_import = statement
                 alias += statement.names
             else:
                 if alias:
                     yield self.add_child(
-                        ast.ImportFrom(module=prev_import.module, names=alias, level=prev_import.level), parent=parent, namespace=prev_import.namespace
+                        ast.ImportFrom(module=prev_import.module, names=alias, level=prev_import.level, **import_kwargs(prev_import)), parent=parent, namespace=prev_import.namespace
                     )
+                    prev_import = None
                     alias = []
 
-                yield statement
+                if can_create_group(statement):
+                    prev_import = statement
+                    alias += statement.names
+                else:
+                    yield statement
 
         if alias:
             yield self.add_child(
-                ast.ImportFrom(module=prev_import.module, names=alias, level=prev_import.level), parent=parent, namespace=prev_import.namespace
+                ast.ImportFrom(module=prev_import.module, names=alias, level=prev_import.level, **import_kwargs(prev_import)), parent=parent, namespace=prev_import.namespace
             )
 
     def suite(self, node_list, parent):

{python_minifier-3.3.0.dist-info → python_minifier-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_minifier
-Version: 3.3.0
+Version: 3.4.0
 Summary: Transform Python source code into it's most compact representation
 Home-page: https://github.com/dflook/python-minifier
 Author: Daniel Flook
@@ -26,13 +26,14 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <3.15
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <3.16
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: author
@@ -54,7 +55,7 @@ Transforms Python source code into its most compact representation.
 
 [Try it out!](https://python-minifier.com)
 
-python-minifier currently supports Python 2.7 and Python 3.3 to 3.14. Previous releases supported Python 2.6.
+python-minifier currently supports Python 2.7 and Python 3.3 to 3.15. Previous releases supported Python 2.6.
 
 * [PyPI](https://pypi.org/project/python-minifier/)
 * [Documentation](https://dflook.github.io/python-minifier/)
@@ -160,7 +161,7 @@ and outputs source code compatible with the version of the interpreter it is run
 This means that if you minify code written for Python 3.11 using python-minifier running with Python 3.12,
 the minified code may only run with Python 3.12.
 
-python-minifier runs with and can minify code written for Python 2.7 and Python 3.3 to 3.14.
+python-minifier runs with and can minify code written for Python 2.7 and Python 3.3 to 3.15.
 
 ## Usage
 

{python_minifier-3.3.0.dist-info → python_minifier-3.4.0.dist-info}/RECORD

@@ -4,26 +4,26 @@ python_minifier/__main__.py,sha256=kALlFc8qTJeYXvYEm10N6eBirMbizdYa_9pMD0xVMuU,1
 python_minifier/ast_compare.py,sha256=KQyS9TGA1SoCs8uu4iks1IINFb_pEj7x38Q4oiERWnI,3381
 python_minifier/ast_compat.py,sha256=DFJ7WmrEfYXfaby8EWt1aRlcqVPPoXD4Fh9Hnb9dLCU,2250
 python_minifier/ast_printer.py,sha256=TlkyKl9_9ScWeop3W1TwXZ46MJWINfkJ7NvmULpwt4A,3254
-python_minifier/expression_printer.py,sha256=4afhOi6MqjWOpYx1kWUcxy_6C5YR7A8oHThkl4altPk,22713
+python_minifier/expression_printer.py,sha256=yvE9yp7aejolL5UfEIf9YluBu74XiGdAJWeKaiXpIFE,22851
 python_minifier/f_string.py,sha256=eXYXaxEMSB3iHY_M_RXYpeloJV-7TYnhWIGge0KYCk8,18314
 python_minifier/ministring.py,sha256=R0xaAZqMlLu1Jm0aBVSI0n8KZiZV7PTs4RE4UbCmTy8,4359
-python_minifier/module_printer.py,sha256=BEnh00P9tt7roLGI4DbE3OJMMw2NmcXUAZjCZ-EuFPs,25671
+python_minifier/module_printer.py,sha256=ylab7kD2ovuAdh3V5XeQPytm7i2P8goC5I1CGBoxVpk,25844
 python_minifier/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_minifier/t_string.py,sha256=z3KzWaSDqvy701SY3dm8VSkiJuiUfopSWGNIm-nDpAo,13261
-python_minifier/token_printer.py,sha256=mF56xx-rdq51gWzVvewh4LpobPfPcFAxOQ3GSMsTJi0,10016
+python_minifier/token_printer.py,sha256=lvnqUmAcUGpEAONLYledk_9ZZkW6-ALuacUqnG9qbgo,10032
 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
 python_minifier/rename/bind_names.py,sha256=CCL2ZT2px___1yE5euO_Wv423DLQFIp5-D7m5RDV7d8,6918
 python_minifier/rename/binding.py,sha256=WPospKLbZN7nnzDayJ55HMxuS-E5zvOE78RJkKiyPrE,15335
-python_minifier/rename/mapper.py,sha256=h3dgg3JgUGQhW7oGwBX1syUgmt5AuaF_OP8dW5ImS5o,6482
+python_minifier/rename/mapper.py,sha256=u36_GRGzATSjv5E86sF-Jvefrns_QXzsUuJ5GLPiTTs,6522
 python_minifier/rename/name_generator.py,sha256=70Klx2DteYRpBT8dr6jYDB31ARfinS42e08kKlWAzLg,1269
 python_minifier/rename/rename_literals.py,sha256=2OM8mW_2j0kXFNZfFQyW9DacIcB6_VYkjv3nmpjRtN8,7536
 python_minifier/rename/renamer.py,sha256=UQWrWrmntT0laNjTxEcH-cK4nZXAzi6LtJCI_STYZbo,6601
 python_minifier/rename/resolve_names.py,sha256=VbePyUUqggvvcF3fAC6XMv6b3Kmb_cmlO9G7vf5Ti-c,4320
 python_minifier/rename/util.py,sha256=ItJykxM_QRjIePMcKYo-LngmP5hLQZK-bOZIefg1cKA,5469
 python_minifier/transforms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_minifier/transforms/combine_imports.py,sha256=7DkNBsTLiiEw01Epa2xj8zkAyVMG3pCTJNlZktqDwDI,2297
+python_minifier/transforms/combine_imports.py,sha256=4uuiFDd1EvYdpAE1wp37n5relFknju-ielG89T9-eKM,3875
 python_minifier/transforms/constant_folding.py,sha256=08YEiSgLeiAKP73Q9p6sS4VDkn_S0zYHtebcgUBWJ6s,6939
 python_minifier/transforms/remove_annotations.py,sha256=qUCdl42yvq1g7B43d88EOz6Jf51A5zogYBlFHGnyugU,4938
 python_minifier/transforms/remove_annotations_options.py,sha256=kzg-gEPwhrCZxsuzdpEWjqnhsyF89hnIPv1t-IRty64,1889
@@ -38,10 +38,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=y5rx0Mc31KfE3je3sXqMvAhJ4hy-JoDC4nDvPCLw13I,7639
-python_minifier-3.3.0.dist-info/licenses/LICENSE,sha256=FzsyDHb8pAZupSGFjIOuHcHMlFf6N-aIxq9gOYGbNyE,1069
-python_minifier-3.3.0.dist-info/METADATA,sha256=lNo1QdzaejO6hP72gYcJMbW2EemrSaLOkgo0_4hlCGs,6756
-python_minifier-3.3.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_minifier-3.3.0.dist-info/entry_points.txt,sha256=ew5TjfSuFJMd5wefRaK3zeoPc_MNQ_o4XN2JiJC5v8Q,59
-python_minifier-3.3.0.dist-info/top_level.txt,sha256=4SRDfWKi_KMq7LDrjlzUFoDCs6INYPtxc1Pun4z8LsU,16
-python_minifier-3.3.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-python_minifier-3.3.0.dist-info/RECORD,,
+python_minifier-3.4.0.dist-info/licenses/LICENSE,sha256=FzsyDHb8pAZupSGFjIOuHcHMlFf6N-aIxq9gOYGbNyE,1069
+python_minifier-3.4.0.dist-info/METADATA,sha256=vcL1qc6-_rx2PoXyySaud4JpEFPIah4vxQA3tx17wpU,6807
+python_minifier-3.4.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_minifier-3.4.0.dist-info/entry_points.txt,sha256=ew5TjfSuFJMd5wefRaK3zeoPc_MNQ_o4XN2JiJC5v8Q,59
+python_minifier-3.4.0.dist-info/top_level.txt,sha256=4SRDfWKi_KMq7LDrjlzUFoDCs6INYPtxc1Pun4z8LsU,16
+python_minifier-3.4.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+python_minifier-3.4.0.dist-info/RECORD,,