pyflyby 1.9.5__tar.gz → 1.9.6__tar.gz

{pyflyby-1.9.5/lib/python/pyflyby.egg-info → pyflyby-1.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyflyby
-Version: 1.9.5
+Version: 1.9.6
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Home-page: https://pypi.org/project/pyflyby/
 Author: Karl Chen
@@ -18,10 +18,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Requires-Python: >3.8, <4
 License-File: LICENSE.txt
-Requires-Dist: six
-Requires-Dist: toml
-Requires-Dist: black
-Requires-Dist: typing_extensions>=4.6; python_version < "3.12"
 
 #########
  Pyflyby

{pyflyby-1.9.5 → pyflyby-1.9.6}/bin/pyflyby/_dbg.py

@@ -909,23 +909,24 @@ def enable_faulthandler():
         faulthandler.enable()
 
 
-def add_debug_functions_to_builtins():
-    '''
+def add_debug_functions_to_builtins(*, add_deprecated: bool):
+    """
     Install debugger(), etc. in the builtin global namespace.
-    '''
+    """
     functions_to_add = [
         'debugger',
         'debug_on_exception',
         'print_traceback',
     ]
-    # DEPRECATED: In the future, the following will not be added to builtins.
-    # Use debugger() instead.
-    functions_to_add += [
-        'breakpoint',
-        'debug_exception',
-        'debug_statement',
-        'waitpoint',
-    ]
+    if add_deprecated:
+        # DEPRECATED: In the future, the following will not be added to builtins.
+        # Use debugger() instead.
+        functions_to_add += [
+            "breakpoint",
+            "debug_exception",
+            "debug_statement",
+            "waitpoint",
+        ]
     for name in functions_to_add:
         setattr(builtins, name, globals()[name])
 

{pyflyby-1.9.5/lib/python → pyflyby-1.9.6/bin}/pyflyby/_importdb.py

@@ -28,7 +28,7 @@ if sys.version_info <= (3, 12):
 else:
     from typing import Self
 
-SUPPORT_DEPRECATED_BEHAVIOR = True
+SUPPORT_DEPRECATED_BEHAVIOR = False
 
 @memoize
 def _find_etc_dirs():

{pyflyby-1.9.5 → pyflyby-1.9.6}/bin/pyflyby/_interactive.py

@@ -2459,7 +2459,7 @@ def load_ipython_extension(arg=Ellipsis):
     enable_faulthandler()
     enable_signal_handler_debugger()
     enable_sigterm_handler(on_existing_handler='keep_existing')
-    add_debug_functions_to_builtins()
+    add_debug_functions_to_builtins(add_deprecated=False)
     inject_dynamic_import()
     initialize_comms()
 

{pyflyby-1.9.5 → pyflyby-1.9.6}/bin/pyflyby/_modules.py

@@ -2,20 +2,18 @@
 # Copyright (C) 2011, 2012, 2013, 2014, 2015 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
 
-
-
+from __future__ import print_function
 
 import ast
-from   functools                import total_ordering
+from   functools                import cached_property, total_ordering
 import itertools
 import os
 
 from   pyflyby._file            import FileText, Filename
 from   pyflyby._idents          import DottedIdentifier, is_identifier
 from   pyflyby._log             import logger
-from   pyflyby._util            import (ExcludeImplicitCwdFromPathCtx,
-                                        cached_attribute, cmp, memoize,
-                                        prefixes)
+from   pyflyby._util            import (ExcludeImplicitCwdFromPathCtx, cmp,
+                                        memoize, prefixes)
 
 import re
 from   six                      import reraise
@@ -167,17 +165,17 @@ class ModuleHandle(object):
         raise NotImplementedError(
             "TODO: look at sys.path to guess module name")
 
-    @cached_attribute
+    @cached_property
     def parent(self):
         if not self.name.parent:
             return None
         return ModuleHandle(self.name.parent)
 
-    @cached_attribute
+    @cached_property
     def ancestors(self):
         return tuple(ModuleHandle(m) for m in self.name.prefixes)
 
-    @cached_attribute
+    @cached_property
     def module(self):
         """
         Return the module instance.
@@ -196,7 +194,7 @@ class ModuleHandle(object):
         # Import.
         return import_module(self.name)
 
-    @cached_attribute
+    @cached_property
     def exists(self):
         """
         Return whether the module exists, according to pkgutil.
@@ -221,7 +219,7 @@ class ModuleHandle(object):
             pkg = None
         return pkg is not None
 
-    @cached_attribute
+    @cached_property
     def filename(self):
         """
         Return the filename, if appropriate.
@@ -268,14 +266,14 @@ class ModuleHandle(object):
             return None
         return Filename(pyc_to_py(filename))
 
-    @cached_attribute
+    @cached_property
     def text(self):
         return FileText(self.filename)
 
     def __text__(self):
         return self.text
 
-    @cached_attribute
+    @cached_property
     def block(self):
         from pyflyby._parse import PythonBlock
         return PythonBlock(self.text)
@@ -309,7 +307,7 @@ class ModuleHandle(object):
         # Canonicalize.
         return tuple(ModuleHandle(m) for m in sorted(set(module_names)))
 
-    @cached_attribute
+    @cached_property
     def submodules(self):
         """
         Enumerate the importable submodules of this module.
@@ -349,7 +347,7 @@ class ModuleHandle(object):
             return extractors[type(node)](node)
         return []
 
-    @cached_attribute
+    @cached_property
     def exports(self):
         """
         Get symbols exported by this module.

{pyflyby-1.9.5/lib/python → pyflyby-1.9.6/bin}/pyflyby/_parse.py

@@ -8,13 +8,13 @@ from   ast                      import AsyncFunctionDef, TypeIgnore
 
 from   collections              import namedtuple
 from   doctest                  import DocTestParser
-from   functools                import total_ordering
+from   functools                import cached_property, total_ordering
 from   itertools                import groupby
 
 from   pyflyby._file            import FilePos, FileText, Filename
 from   pyflyby._flags           import CompilerFlags
 from   pyflyby._log             import logger
-from   pyflyby._util            import cached_attribute, cmp
+from   pyflyby._util            import cmp
 
 import re
 import sys
@@ -1044,7 +1044,7 @@ class PythonBlock:
     def endpos(self):
         return self.text.endpos
 
-    @cached_attribute
+    @cached_property
     def _ast_node_or_parse_exception(self):
         """
         Attempt to parse this block of code into an abstract syntax tree.
@@ -1069,7 +1069,7 @@ class PythonBlock:
             # Cache the exception to avoid re-attempting while debugging.
             return e
 
-    @cached_attribute
+    @cached_property
     def parsable(self):
         """
         Whether the contents of this ``PythonBlock`` are parsable as Python
@@ -1080,7 +1080,7 @@ class PythonBlock:
         """
         return isinstance(self._ast_node_or_parse_exception, ast.AST)
 
-    @cached_attribute
+    @cached_property
     def parsable_as_expression(self):
         """
         Whether the contents of this ``PythonBlock`` are parsable as a single
@@ -1091,7 +1091,7 @@ class PythonBlock:
         """
         return self.parsable and self.expression_ast_node is not None
 
-    @cached_attribute
+    @cached_property
     def ast_node(self):
         """
         Parse this block of code into an abstract syntax tree.
@@ -1112,7 +1112,7 @@ class PythonBlock:
         else:
             raise r
 
-    @cached_attribute
+    @cached_property
     def annotated_ast_node(self) -> AnnotatedAst:
         """
         Return ``self.ast_node``, annotated in place with positions.
@@ -1127,7 +1127,7 @@ class PythonBlock:
         # ! result is mutated and returned
         return _annotate_ast_nodes(result)
 
-    @cached_attribute
+    @cached_property
     def expression_ast_node(self) -> Optional[ast.Expression]:
         """
         Return an ``ast.Expression`` if ``self.ast_node`` can be converted into
@@ -1188,7 +1188,7 @@ class PythonBlock:
         filename = str(self.filename or "<unknown>")
         return compile(ast_node, filename, mode)
 
-    @cached_attribute
+    @cached_property
     def statements(self) -> Tuple[PythonStatement, ...]:
         r"""
         Partition of this ``PythonBlock`` into individual ``PythonStatement`` s.
@@ -1245,7 +1245,7 @@ class PythonBlock:
             statements.append(statement)
         return tuple(statements)
 
-    @cached_attribute
+    @cached_property
     def source_flags(self):
         """
         If the AST contains __future__ imports, then the compiler_flags
@@ -1261,7 +1261,7 @@ class PythonBlock:
         """
         return self.ast_node.source_flags
 
-    @cached_attribute
+    @cached_property
     def flags(self):
         """
         The compiler flags for this code block, including both the input flags

{pyflyby-1.9.5/lib/python → pyflyby-1.9.6/bin}/pyflyby/_py.py

@@ -30,6 +30,12 @@ Invocation summary
   py nb                                 Start IPython Notebook with autoimporter
 
 
+  py [--add-deprecated-builtins]        Inject "breakpoint", "debug_exception",
+                                        "debug_statement", "waitpoint" into
+                                        builtins. This is deprecated, and
+                                        present for backward compatibilty
+                                        but will be removed in the future.
+
 Features
 ========
 
@@ -1688,6 +1694,7 @@ class _PyMain(object):
 
     def _parse_global_opts(self):
         args = list(self.main_args)
+        self.add_deprecated_builtins = False
         self.debug       = False
         self.interactive = False
         self.verbosity   = 1
@@ -1791,6 +1798,10 @@ class _PyMain(object):
                 novalue()
                 postmortem = False
                 continue
+            if argname in ["add-deprecated-builtins", "add_deprecated_builtins"]:
+                del args[0]
+                self.add_deprecated_builtins = True
+                continue
             break
         self.args = args
         if postmortem == "auto":
@@ -1798,18 +1809,18 @@ class _PyMain(object):
         global _enable_postmortem_debugger
         _enable_postmortem_debugger = postmortem
 
-    def _enable_debug_tools(self):
+    def _enable_debug_tools(self, *, add_deprecated: bool):
         # Enable a bunch of debugging tools.
         enable_faulthandler()
         enable_signal_handler_debugger()
         enable_sigterm_handler()
-        add_debug_functions_to_builtins()
+        add_debug_functions_to_builtins(add_deprecated=add_deprecated)
 
     def run(self):
         # Parse global options.
         sys.orig_argv = list(sys.argv)
         self._parse_global_opts()
-        self._enable_debug_tools()
+        self._enable_debug_tools(add_deprecated=self.add_deprecated_builtins)
         self._run_action()
         self._pre_exit()
 

{pyflyby-1.9.5/lib/python → pyflyby-1.9.6/bin}/pyflyby/_version.py

@@ -4,4 +4,4 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 
-__version__ = "1.9.5"
+__version__ = "1.9.6"

{pyflyby-1.9.5 → pyflyby-1.9.6}/lib/python/pyflyby/_dbg.py

@@ -909,23 +909,24 @@ def enable_faulthandler():
         faulthandler.enable()
 
 
-def add_debug_functions_to_builtins():
-    '''
+def add_debug_functions_to_builtins(*, add_deprecated: bool):
+    """
     Install debugger(), etc. in the builtin global namespace.
-    '''
+    """
     functions_to_add = [
         'debugger',
         'debug_on_exception',
         'print_traceback',
     ]
-    # DEPRECATED: In the future, the following will not be added to builtins.
-    # Use debugger() instead.
-    functions_to_add += [
-        'breakpoint',
-        'debug_exception',
-        'debug_statement',
-        'waitpoint',
-    ]
+    if add_deprecated:
+        # DEPRECATED: In the future, the following will not be added to builtins.
+        # Use debugger() instead.
+        functions_to_add += [
+            "breakpoint",
+            "debug_exception",
+            "debug_statement",
+            "waitpoint",
+        ]
     for name in functions_to_add:
         setattr(builtins, name, globals()[name])
 

{pyflyby-1.9.5/bin → pyflyby-1.9.6/lib/python}/pyflyby/_importdb.py

@@ -28,7 +28,7 @@ if sys.version_info <= (3, 12):
 else:
     from typing import Self
 
-SUPPORT_DEPRECATED_BEHAVIOR = True
+SUPPORT_DEPRECATED_BEHAVIOR = False
 
 @memoize
 def _find_etc_dirs():

{pyflyby-1.9.5 → pyflyby-1.9.6}/lib/python/pyflyby/_interactive.py

@@ -2459,7 +2459,7 @@ def load_ipython_extension(arg=Ellipsis):
     enable_faulthandler()
     enable_signal_handler_debugger()
     enable_sigterm_handler(on_existing_handler='keep_existing')
-    add_debug_functions_to_builtins()
+    add_debug_functions_to_builtins(add_deprecated=False)
     inject_dynamic_import()
     initialize_comms()
 

{pyflyby-1.9.5 → pyflyby-1.9.6}/lib/python/pyflyby/_modules.py

@@ -2,20 +2,18 @@
 # Copyright (C) 2011, 2012, 2013, 2014, 2015 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
 
-
-
+from __future__ import print_function
 
 import ast
-from   functools                import total_ordering
+from   functools                import cached_property, total_ordering
 import itertools
 import os
 
 from   pyflyby._file            import FileText, Filename
 from   pyflyby._idents          import DottedIdentifier, is_identifier
 from   pyflyby._log             import logger
-from   pyflyby._util            import (ExcludeImplicitCwdFromPathCtx,
-                                        cached_attribute, cmp, memoize,
-                                        prefixes)
+from   pyflyby._util            import (ExcludeImplicitCwdFromPathCtx, cmp,
+                                        memoize, prefixes)
 
 import re
 from   six                      import reraise
@@ -167,17 +165,17 @@ class ModuleHandle(object):
         raise NotImplementedError(
             "TODO: look at sys.path to guess module name")
 
-    @cached_attribute
+    @cached_property
     def parent(self):
         if not self.name.parent:
             return None
         return ModuleHandle(self.name.parent)
 
-    @cached_attribute
+    @cached_property
     def ancestors(self):
         return tuple(ModuleHandle(m) for m in self.name.prefixes)
 
-    @cached_attribute
+    @cached_property
     def module(self):
         """
         Return the module instance.
@@ -196,7 +194,7 @@ class ModuleHandle(object):
         # Import.
         return import_module(self.name)
 
-    @cached_attribute
+    @cached_property
     def exists(self):
         """
         Return whether the module exists, according to pkgutil.
@@ -221,7 +219,7 @@ class ModuleHandle(object):
             pkg = None
         return pkg is not None
 
-    @cached_attribute
+    @cached_property
     def filename(self):
         """
         Return the filename, if appropriate.
@@ -268,14 +266,14 @@ class ModuleHandle(object):
             return None
         return Filename(pyc_to_py(filename))
 
-    @cached_attribute
+    @cached_property
     def text(self):
         return FileText(self.filename)
 
     def __text__(self):
         return self.text
 
-    @cached_attribute
+    @cached_property
     def block(self):
         from pyflyby._parse import PythonBlock
         return PythonBlock(self.text)
@@ -309,7 +307,7 @@ class ModuleHandle(object):
         # Canonicalize.
         return tuple(ModuleHandle(m) for m in sorted(set(module_names)))
 
-    @cached_attribute
+    @cached_property
     def submodules(self):
         """
         Enumerate the importable submodules of this module.
@@ -349,7 +347,7 @@ class ModuleHandle(object):
             return extractors[type(node)](node)
         return []
 
-    @cached_attribute
+    @cached_property
     def exports(self):
         """
         Get symbols exported by this module.

{pyflyby-1.9.5/bin → pyflyby-1.9.6/lib/python}/pyflyby/_parse.py

@@ -8,13 +8,13 @@ from   ast                      import AsyncFunctionDef, TypeIgnore
 
 from   collections              import namedtuple
 from   doctest                  import DocTestParser
-from   functools                import total_ordering
+from   functools                import cached_property, total_ordering
 from   itertools                import groupby
 
 from   pyflyby._file            import FilePos, FileText, Filename
 from   pyflyby._flags           import CompilerFlags
 from   pyflyby._log             import logger
-from   pyflyby._util            import cached_attribute, cmp
+from   pyflyby._util            import cmp
 
 import re
 import sys
@@ -1044,7 +1044,7 @@ class PythonBlock:
     def endpos(self):
         return self.text.endpos
 
-    @cached_attribute
+    @cached_property
     def _ast_node_or_parse_exception(self):
         """
         Attempt to parse this block of code into an abstract syntax tree.
@@ -1069,7 +1069,7 @@ class PythonBlock:
             # Cache the exception to avoid re-attempting while debugging.
             return e
 
-    @cached_attribute
+    @cached_property
     def parsable(self):
         """
         Whether the contents of this ``PythonBlock`` are parsable as Python
@@ -1080,7 +1080,7 @@ class PythonBlock:
         """
         return isinstance(self._ast_node_or_parse_exception, ast.AST)
 
-    @cached_attribute
+    @cached_property
     def parsable_as_expression(self):
         """
         Whether the contents of this ``PythonBlock`` are parsable as a single
@@ -1091,7 +1091,7 @@ class PythonBlock:
         """
         return self.parsable and self.expression_ast_node is not None
 
-    @cached_attribute
+    @cached_property
     def ast_node(self):
         """
         Parse this block of code into an abstract syntax tree.
@@ -1112,7 +1112,7 @@ class PythonBlock:
         else:
             raise r
 
-    @cached_attribute
+    @cached_property
     def annotated_ast_node(self) -> AnnotatedAst:
         """
         Return ``self.ast_node``, annotated in place with positions.
@@ -1127,7 +1127,7 @@ class PythonBlock:
         # ! result is mutated and returned
         return _annotate_ast_nodes(result)
 
-    @cached_attribute
+    @cached_property
     def expression_ast_node(self) -> Optional[ast.Expression]:
         """
         Return an ``ast.Expression`` if ``self.ast_node`` can be converted into
@@ -1188,7 +1188,7 @@ class PythonBlock:
         filename = str(self.filename or "<unknown>")
         return compile(ast_node, filename, mode)
 
-    @cached_attribute
+    @cached_property
     def statements(self) -> Tuple[PythonStatement, ...]:
         r"""
         Partition of this ``PythonBlock`` into individual ``PythonStatement`` s.
@@ -1245,7 +1245,7 @@ class PythonBlock:
             statements.append(statement)
         return tuple(statements)
 
-    @cached_attribute
+    @cached_property
     def source_flags(self):
         """
         If the AST contains __future__ imports, then the compiler_flags
@@ -1261,7 +1261,7 @@ class PythonBlock:
         """
         return self.ast_node.source_flags
 
-    @cached_attribute
+    @cached_property
     def flags(self):
         """
         The compiler flags for this code block, including both the input flags

{pyflyby-1.9.5/bin → pyflyby-1.9.6/lib/python}/pyflyby/_py.py

@@ -30,6 +30,12 @@ Invocation summary
   py nb                                 Start IPython Notebook with autoimporter
 
 
+  py [--add-deprecated-builtins]        Inject "breakpoint", "debug_exception",
+                                        "debug_statement", "waitpoint" into
+                                        builtins. This is deprecated, and
+                                        present for backward compatibilty
+                                        but will be removed in the future.
+
 Features
 ========
 
@@ -1688,6 +1694,7 @@ class _PyMain(object):
 
     def _parse_global_opts(self):
         args = list(self.main_args)
+        self.add_deprecated_builtins = False
         self.debug       = False
         self.interactive = False
         self.verbosity   = 1
@@ -1791,6 +1798,10 @@ class _PyMain(object):
                 novalue()
                 postmortem = False
                 continue
+            if argname in ["add-deprecated-builtins", "add_deprecated_builtins"]:
+                del args[0]
+                self.add_deprecated_builtins = True
+                continue
             break
         self.args = args
         if postmortem == "auto":
@@ -1798,18 +1809,18 @@ class _PyMain(object):
         global _enable_postmortem_debugger
         _enable_postmortem_debugger = postmortem
 
-    def _enable_debug_tools(self):
+    def _enable_debug_tools(self, *, add_deprecated: bool):
         # Enable a bunch of debugging tools.
         enable_faulthandler()
         enable_signal_handler_debugger()
         enable_sigterm_handler()
-        add_debug_functions_to_builtins()
+        add_debug_functions_to_builtins(add_deprecated=add_deprecated)
 
     def run(self):
         # Parse global options.
         sys.orig_argv = list(sys.argv)
         self._parse_global_opts()
-        self._enable_debug_tools()
+        self._enable_debug_tools(add_deprecated=self.add_deprecated_builtins)
         self._run_action()
         self._pre_exit()
 

{pyflyby-1.9.5/bin → pyflyby-1.9.6/lib/python}/pyflyby/_version.py

@@ -4,4 +4,4 @@
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 
-__version__ = "1.9.5"
+__version__ = "1.9.6"

{pyflyby-1.9.5 → pyflyby-1.9.6/lib/python/pyflyby.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyflyby
-Version: 1.9.5
+Version: 1.9.6
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Home-page: https://pypi.org/project/pyflyby/
 Author: Karl Chen
@@ -18,10 +18,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Requires-Python: >3.8, <4
 License-File: LICENSE.txt
-Requires-Dist: six
-Requires-Dist: toml
-Requires-Dist: black
-Requires-Dist: typing_extensions>=4.6; python_version < "3.12"
 
 #########
  Pyflyby

{pyflyby-1.9.5 → pyflyby-1.9.6}/lib/python/pyflyby.egg-info/SOURCES.txt

@@ -19,7 +19,6 @@ bin/reformat-imports
 bin/replace-star-imports
 bin/tidy-imports
 bin/transform-imports
-bin/pyflyby/.DS_Store
 bin/pyflyby/__init__.py
 bin/pyflyby/__main__.py
 bin/pyflyby/_autoimp.py
@@ -47,7 +46,6 @@ bin/pyflyby/_util.py
 bin/pyflyby/_version.py
 bin/pyflyby/autoimport.py
 bin/pyflyby/importdb.py
-doc/.DS_Store
 doc/LICENSE.txt
 doc/Makefile
 doc/TODO.txt
@@ -94,10 +92,7 @@ etc/pyflyby/forget.py
 etc/pyflyby/mandatory.py
 etc/pyflyby/numpy.py
 etc/pyflyby/std.py
-lib/.DS_Store
 lib/emacs/pyflyby.el
-lib/python/.DS_Store
-lib/python/pyflyby/.DS_Store
 lib/python/pyflyby/__init__.py
 lib/python/pyflyby/__main__.py
 lib/python/pyflyby/_autoimp.py