pyflyby 1.9.1__tar.gz → 1.9.2__tar.gz

{pyflyby-1.9.1/lib/python/pyflyby.egg-info → pyflyby-1.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyflyby
-Version: 1.9.1
+Version: 1.9.2
 Summary: pyflyby - Python development productivity tools, in particular automatic import management
 Home-page: https://pypi.org/project/pyflyby/
 Author: Karl Chen

{pyflyby-1.9.1 → pyflyby-1.9.2}/bin/pyflyby/_autoimp.py

@@ -609,11 +609,11 @@ class _MissingImportFinder(object):
         if self._in_class_def == 0:
             self.scopestack._class_delayed[node.name] = None
         with self._NewScopeCtx(new_class_scope=True):
-            if not self._in_class_def:
-                self._in_class_def += 1
-                self._visit_Store(node.name)
+            self._in_class_def += 1
+            self._visit_Store(node.name)
             self.visit(node.body)
             self._in_class_def -= 1
+        assert self._in_class_def >= 0
         self._remove_from_missing_imports(node.name)
         self._visit_Store(node.name)
 

{pyflyby-1.9.1 → pyflyby-1.9.2}/bin/pyflyby/_cmdline.py

@@ -7,11 +7,11 @@
 import optparse
 import os
 import signal
-from   six                      import reraise
-from   six.moves                import input
+from   builtins                 import input
 import sys
 from   textwrap                 import dedent
 import traceback
+from   typing                   import List
 
 
 from   pyflyby._file            import (FileText, Filename, atomic_write_file,
@@ -376,7 +376,7 @@ class Modifier(object):
             f.close()
 
 
-def process_actions(filenames, actions, modify_function,
+def process_actions(filenames:List[str], actions, modify_function,
                     reraise_exceptions=()):
     errors = []
     def on_error_filename_arg(arg):
@@ -408,7 +408,7 @@ def process_actions(filenames, actions, modify_function,
                         # Exception takes more than one argument
                         pass
                 if logger.debug_enabled:
-                    reraise(type_e, e, tb)
+                    raise
                 traceback.print_exception(type(e), e, tb)
             finally:
                 tb = None # avoid refcycles involving tb

{pyflyby-1.9.1/lib/python → pyflyby-1.9.2/bin}/pyflyby/_file.py

@@ -4,13 +4,14 @@
 
 
 
-from   functools                import total_ordering
+from   functools                import total_ordering, cached_property
 import io
 import os
 import re
 import sys
+from   typing                   import Optional, Tuple
 
-from   pyflyby._util            import cached_attribute, cmp, memoize
+from   pyflyby._util            import cmp, memoize
 
 
 class UnsafeFilenameError(ValueError):
@@ -28,6 +29,8 @@ class Filename(object):
       Filename('/etc/passwd')
 
     """
+    _filename: str
+
     def __new__(cls, arg):
         if isinstance(arg, cls):
             return arg
@@ -85,7 +88,7 @@ class Filename(object):
             return NotImplemented
         return cmp(self._filename, o._filename)
 
-    @cached_attribute
+    @cached_property
     def ext(self):
         """
         Returns the extension of this filename, including the dot.
@@ -99,15 +102,15 @@ class Filename(object):
             return None
         return dot + rhs
 
-    @cached_attribute
+    @cached_property
     def base(self):
         return os.path.basename(self._filename)
 
-    @cached_attribute
+    @cached_property
     def dir(self):
         return type(self)(os.path.dirname(self._filename))
 
-    @cached_attribute
+    @cached_property
     def real(self):
         return type(self)(os.path.realpath(self._filename))
 
@@ -230,6 +233,9 @@ class FilePos(object):
     Both lineno and colno are 1-indexed.
     """
 
+    lineno: int
+    colno: int
+
     def __new__(cls, *args):
         if len(args) == 0:
             return cls._ONE_ONE
@@ -265,7 +271,7 @@ class FilePos(object):
             raise TypeError("Expected (int,int); got %r" % (args,))
 
     @classmethod
-    def _from_lc(cls, lineno, colno):
+    def _from_lc(cls, lineno:int, colno:int):
         self = object.__new__(cls)
         self.lineno = lineno
         self.colno  = colno
@@ -338,6 +344,10 @@ class FileText:
     Represents a contiguous sequence of lines from a file.
     """
 
+    filename: Optional[Filename]
+    startpos: FilePos
+    _lines: Optional[Tuple[str, ...]] = None
+
     def __new__(cls, arg, filename=None, startpos=None):
         """
         Return a new ``FileText`` instance.
@@ -371,7 +381,7 @@ class FileText:
             return FileText(arg.__text__(), filename=filename, startpos=startpos)
         elif isinstance(arg, str):
             self = object.__new__(cls)
-            self.joined = arg
+            self._lines = tuple(arg.split('\n'))
         else:
             raise TypeError("%s: unexpected %s"
                             % (cls.__name__, type(arg).__name__))
@@ -383,19 +393,21 @@ class FileText:
         return self
 
     @classmethod
-    def _from_lines(cls, lines, filename, startpos):
+    def _from_lines(cls, lines, filename: Optional[Filename], startpos: FilePos):
         assert type(lines) is tuple
         assert len(lines) > 0
         assert isinstance(lines[0], str)
         assert not lines[-1].endswith("\n")
+        assert isinstance(startpos, FilePos), repr(startpos)
+        assert isinstance(filename, (Filename, type(None))), repr(filename)
         self = object.__new__(cls)
-        self.lines    = lines
+        self._lines    = tuple(lines)
         self.filename = filename
         self.startpos = startpos
         return self
 
-    @cached_attribute
-    def lines(self):
+    @cached_property
+    def lines(self) -> Tuple[str, ...]:
         r"""
         Lines that have been split by newline.
 
@@ -408,16 +420,19 @@ class FileText:
         :rtype:
           ``tuple`` of ``str``
         """
+        if self._lines is not None:
+            return self._lines
         # Used if only initialized with 'joined'.
         # We use str.split() instead of str.splitlines() because the latter
         # doesn't distinguish between strings that end in newline or not
         # (or requires extra work to process if we use splitlines(True)).
         return tuple(self.joined.split('\n'))
 
-    @cached_attribute
-    def joined(self): # used if only initialized with 'lines'
+    @cached_property
+    def joined(self) -> str:
         return '\n'.join(self.lines)
 
+
     @classmethod
     def from_filename(cls, filename):
         return cls.from_lines(Filename(filename))
@@ -435,13 +450,12 @@ class FileText:
             return self
         else:
             result = object.__new__(type(self))
-            result.lines    = self.lines
-            result.joined   = self.joined
+            result._lines   = self._lines
             result.filename = filename
             result.startpos = startpos
             return result
 
-    @cached_attribute
+    @cached_property
     def endpos(self):
         """
         The position after the last character in the text.

{pyflyby-1.9.1 → pyflyby-1.9.2}/bin/pyflyby/_imports2s.py

@@ -3,7 +3,6 @@
 # License: MIT http://opensource.org/licenses/MIT
 from collections import defaultdict
 
-import isort
 from   pyflyby._autoimp         import scan_for_import_issues
 from   pyflyby._file            import FileText, Filename
 from   pyflyby._flags           import CompilerFlags
@@ -14,10 +13,12 @@ from   pyflyby._log             import logger
 from   pyflyby._parse           import PythonBlock
 from   pyflyby._util            import ImportPathCtx, Inf, NullCtx, memoize
 import re
-from   six                      import exec_
 
 
 class SourceToSourceTransformationBase(object):
+
+    input: PythonBlock
+
     def __new__(cls, arg):
         if isinstance(arg, cls):
             return arg
@@ -52,11 +53,15 @@ class SourceToSourceTransformationBase(object):
 
 
 class SourceToSourceTransformation(SourceToSourceTransformationBase):
+
+    _output: PythonBlock
+
     def preprocess(self):
-        self.output = self.input
+        assert isinstance(self.input, PythonBlock), self.input
+        self._output = self.input
 
     def pretty_print(self, params=None):
-        return self.output.text
+        return self._output.text
 
 
 class SourceToSourceImportBlockTransformation(SourceToSourceTransformationBase):
@@ -195,12 +200,10 @@ class SourceToSourceFileImportsTransformation(SourceToSourceTransformationBase):
                     # insert in the middle.
                     self.blocks[:1] = (
                         [SourceToSourceTransformation(
-                            PythonBlock.concatenate(statements[:idx],
-                                                    assume_contiguous=True))] +
+                            PythonBlock.concatenate(statements[:idx]))] +
                         blocks +
                         [SourceToSourceTransformation(
-                            PythonBlock.concatenate(statements[idx:],
-                                                    assume_contiguous=True))])
+                            PythonBlock.concatenate(statements[idx:]))])
                 break
         else:
             # First block is entirely comments, so just insert after it.
@@ -214,7 +217,7 @@ class SourceToSourceFileImportsTransformation(SourceToSourceTransformationBase):
         """
         block = SourceToSourceImportBlockTransformation("")
         sepblock = SourceToSourceTransformation("")
-        sepblock.output = PythonBlock("\n")
+        sepblock._output = PythonBlock("\n")
         self.insert_new_blocks_after_comments([block, sepblock])
         self.import_blocks.insert(0, block)
         return block
@@ -433,7 +436,7 @@ def remove_broken_imports(codeblock, params=None):
         for imp in list(block.importset.imports):
             ns = {}
             try:
-                exec_(imp.pretty_print(), ns)
+                exec(imp.pretty_print(), ns)
             except Exception as e:
                 logger.info("%s: Could not import %r; removing it: %s: %s",
                             filename, imp.fullname, type(e).__name__, e)
@@ -540,6 +543,7 @@ def sort_imports(codeblock):
     :param codeblock:
     :return: codeblock
     """
+    import isort
     sorted_imports = isort.code(
         str(codeblock),
         # To sort all the import in lexicographic order
@@ -644,7 +648,7 @@ def transform_imports(codeblock, transformations, params=None):
             output_imports = [ transform_import(imp) for imp in input_imports ]
             block.importset = ImportSet(output_imports, ignore_shadowed=True)
         else:
-            block.output = transform_block(block.input)
+            block._output = transform_block(block.input)
     return transformer.output(params=params)
 
 

{pyflyby-1.9.1/lib/python → pyflyby-1.9.2/bin}/pyflyby/_parse.py

@@ -1,7 +1,7 @@
 # pyflyby/_parse.py.
 # Copyright (C) 2011, 2012, 2013, 2014, 2015, 2018 Karl Chen.
 # License: MIT http://opensource.org/licenses/MIT
-
+from __future__ import annotations
 
 
 import ast
@@ -13,6 +13,8 @@ import re
 import sys
 from   textwrap                 import dedent
 import types
+from   typing                   import Optional
+import warnings
 
 from   pyflyby._file            import FilePos, FileText, Filename
 from   pyflyby._flags           import CompilerFlags
@@ -22,6 +24,8 @@ from   pyflyby._util            import cached_attribute, cmp
 
 from ast import TypeIgnore, AsyncFunctionDef
 
+_sentinel = object()
+
 
 def _is_comment_or_blank(line):
     """
@@ -741,7 +745,7 @@ class _DummyAst_Node(object):
     pass
 
 
-class PythonStatement(object):
+class PythonStatement:
     r"""
     Representation of a top-level Python statement or consecutive
     comments/blank lines.
@@ -753,7 +757,9 @@ class PythonStatement(object):
     top-level AST node.
     """
 
-    def __new__(cls, arg, filename=None, startpos=None, flags=None):
+    block: PythonBlock
+
+    def __new__(cls, arg:PythonStatement, filename=None, startpos=None, flags=None):
         if isinstance(arg, cls):
             if filename is startpos is flags is None:
                 return arg
@@ -773,7 +779,8 @@ class PythonStatement(object):
         raise TypeError("PythonStatement: unexpected %s" % (type(arg).__name__,))
 
     @classmethod
-    def _construct_from_block(cls, block):
+    def _construct_from_block(cls, block:PythonBlock):
+        assert isinstance(block, PythonBlock), repr(block)
         # Only to be used by PythonBlock.
         assert isinstance(block, PythonBlock)
         self = object.__new__(cls)
@@ -781,7 +788,7 @@ class PythonStatement(object):
         return self
 
     @property
-    def text(self):
+    def text(self) -> FileText:
         """
         :rtype:
           `FileText`
@@ -789,7 +796,7 @@ class PythonStatement(object):
         return self.block.text
 
     @property
-    def filename(self):
+    def filename(self) -> Optional[str]:
         """
         :rtype:
           `Filename`
@@ -828,9 +835,17 @@ class PythonStatement(object):
             return ast_nodes[0]
         raise AssertionError("More than one AST node in block")
 
+    @property
+    def is_blank(self):
+        return self.ast_node is None and self.text.joined.strip() == ''
+
+    @property
+    def is_comment(self):
+        return self.ast_node is None and self.text.joined.strip() != ''
+
     @property
     def is_comment_or_blank(self):
-        return self.ast_node is None
+        return self.is_comment or self.is_blank
 
     @property
     def is_comment_or_blank_or_string_literal(self):
@@ -898,7 +913,7 @@ class PythonStatement(object):
 
 
 @total_ordering
-class PythonBlock(object):
+class PythonBlock:
     r"""
     Representation of a sequence of consecutive top-level
     `PythonStatement` (s).
@@ -920,6 +935,8 @@ class PythonBlock(object):
 
     """
 
+    text: FileText
+
     def __new__(cls, arg, filename=None, startpos=None, flags=None,
                 auto_flags=None):
         if isinstance(arg, PythonStatement):
@@ -935,7 +952,7 @@ class PythonBlock(object):
             return cls.from_text(
                 arg, filename=filename, startpos=startpos,
                 flags=flags, auto_flags=auto_flags)
-        raise TypeError("%s: unexpected %s"
+        raise TypeError("%r: unexpected %r"
                         % (cls.__name__, type(arg).__name__,))
 
     @classmethod
@@ -991,17 +1008,21 @@ class PythonBlock(object):
         return self
 
     @classmethod
-    def concatenate(cls, blocks, assume_contiguous=False):
+    def concatenate(cls, blocks, assume_contiguous=_sentinel):
         """
         Concatenate a bunch of blocks into one block.
 
         :type blocks:
           sequence of `PythonBlock` s and/or `PythonStatement` s
         :param assume_contiguous:
+          Deprecated, always True
           Whether to assume, without checking, that the input blocks were
           originally all contiguous.  This must be set to True to indicate the
           caller understands the assumption; False is not implemented.
         """
+        if assume_contiguous is not _sentinel:
+            warnings.warn('`assume_continuous` is deprecated and considered always `True`')
+            assume_contiguous = True
         if not assume_contiguous:
             raise NotImplementedError
         blocks = [PythonBlock(b) for b in blocks]
@@ -1246,7 +1267,7 @@ class PythonBlock(object):
         cls = type(self)
         for pred, stmts in groupby(self.statements, predicate):
             blocks = [s.block for s in stmts]
-            yield pred, cls.concatenate(blocks, assume_contiguous=True)
+            yield pred, cls.concatenate(blocks)
 
     def string_literals(self):
         r"""

{pyflyby-1.9.1/lib/python → pyflyby-1.9.2/bin}/pyflyby/_version.py

@@ -5,4 +5,4 @@
 
 
 
-__version__ = '1.9.1'
+__version__ = '1.9.2'

{pyflyby-1.9.1 → pyflyby-1.9.2}/bin/tidy-imports

@@ -21,9 +21,6 @@ Only top-level import statements are touched.
 # License: MIT http://opensource.org/licenses/MIT
 
 
-from   distutils.spawn          import find_executable
-import subprocess
-import sys
 import os
 
 from   pyflyby._cmdline         import hfmt, parse_args, process_actions
@@ -31,7 +28,6 @@ from pyflyby._imports2s import (canonicalize_imports,
                                 fix_unused_and_missing_imports,
                                 replace_star_imports,
                                 transform_imports, sort_imports)
-from   pyflyby._log             import logger
 
 import toml
 TOML_AVAIL = True

{pyflyby-1.9.1 → pyflyby-1.9.2}/lib/python/pyflyby/_autoimp.py

@@ -609,11 +609,11 @@ class _MissingImportFinder(object):
         if self._in_class_def == 0:
             self.scopestack._class_delayed[node.name] = None
         with self._NewScopeCtx(new_class_scope=True):
-            if not self._in_class_def:
-                self._in_class_def += 1
-                self._visit_Store(node.name)
+            self._in_class_def += 1
+            self._visit_Store(node.name)
             self.visit(node.body)
             self._in_class_def -= 1
+        assert self._in_class_def >= 0
         self._remove_from_missing_imports(node.name)
         self._visit_Store(node.name)
 

{pyflyby-1.9.1 → pyflyby-1.9.2}/lib/python/pyflyby/_cmdline.py

@@ -7,11 +7,11 @@
 import optparse
 import os
 import signal
-from   six                      import reraise
-from   six.moves                import input
+from   builtins                 import input
 import sys
 from   textwrap                 import dedent
 import traceback
+from   typing                   import List
 
 
 from   pyflyby._file            import (FileText, Filename, atomic_write_file,
@@ -376,7 +376,7 @@ class Modifier(object):
             f.close()
 
 
-def process_actions(filenames, actions, modify_function,
+def process_actions(filenames:List[str], actions, modify_function,
                     reraise_exceptions=()):
     errors = []
     def on_error_filename_arg(arg):
@@ -408,7 +408,7 @@ def process_actions(filenames, actions, modify_function,
                         # Exception takes more than one argument
                         pass
                 if logger.debug_enabled:
-                    reraise(type_e, e, tb)
+                    raise
                 traceback.print_exception(type(e), e, tb)
             finally:
                 tb = None # avoid refcycles involving tb

{pyflyby-1.9.1/bin → pyflyby-1.9.2/lib/python}/pyflyby/_file.py

@@ -4,13 +4,14 @@
 
 
 
-from   functools                import total_ordering
+from   functools                import total_ordering, cached_property
 import io
 import os
 import re
 import sys
+from   typing                   import Optional, Tuple
 
-from   pyflyby._util            import cached_attribute, cmp, memoize
+from   pyflyby._util            import cmp, memoize
 
 
 class UnsafeFilenameError(ValueError):
@@ -28,6 +29,8 @@ class Filename(object):
       Filename('/etc/passwd')
 
     """
+    _filename: str
+
     def __new__(cls, arg):
         if isinstance(arg, cls):
             return arg
@@ -85,7 +88,7 @@ class Filename(object):
             return NotImplemented
         return cmp(self._filename, o._filename)
 
-    @cached_attribute
+    @cached_property
     def ext(self):
         """
         Returns the extension of this filename, including the dot.
@@ -99,15 +102,15 @@ class Filename(object):
             return None
         return dot + rhs
 
-    @cached_attribute
+    @cached_property
     def base(self):
         return os.path.basename(self._filename)
 
-    @cached_attribute
+    @cached_property
     def dir(self):
         return type(self)(os.path.dirname(self._filename))
 
-    @cached_attribute
+    @cached_property
     def real(self):
         return type(self)(os.path.realpath(self._filename))
 
@@ -230,6 +233,9 @@ class FilePos(object):
     Both lineno and colno are 1-indexed.
     """
 
+    lineno: int
+    colno: int
+
     def __new__(cls, *args):
         if len(args) == 0:
             return cls._ONE_ONE
@@ -265,7 +271,7 @@ class FilePos(object):
             raise TypeError("Expected (int,int); got %r" % (args,))
 
     @classmethod
-    def _from_lc(cls, lineno, colno):
+    def _from_lc(cls, lineno:int, colno:int):
         self = object.__new__(cls)
         self.lineno = lineno
         self.colno  = colno
@@ -338,6 +344,10 @@ class FileText:
     Represents a contiguous sequence of lines from a file.
     """
 
+    filename: Optional[Filename]
+    startpos: FilePos
+    _lines: Optional[Tuple[str, ...]] = None
+
     def __new__(cls, arg, filename=None, startpos=None):
         """
         Return a new ``FileText`` instance.
@@ -371,7 +381,7 @@ class FileText:
             return FileText(arg.__text__(), filename=filename, startpos=startpos)
         elif isinstance(arg, str):
             self = object.__new__(cls)
-            self.joined = arg
+            self._lines = tuple(arg.split('\n'))
         else:
             raise TypeError("%s: unexpected %s"
                             % (cls.__name__, type(arg).__name__))
@@ -383,19 +393,21 @@ class FileText:
         return self
 
     @classmethod
-    def _from_lines(cls, lines, filename, startpos):
+    def _from_lines(cls, lines, filename: Optional[Filename], startpos: FilePos):
         assert type(lines) is tuple
         assert len(lines) > 0
         assert isinstance(lines[0], str)
         assert not lines[-1].endswith("\n")
+        assert isinstance(startpos, FilePos), repr(startpos)
+        assert isinstance(filename, (Filename, type(None))), repr(filename)
         self = object.__new__(cls)
-        self.lines    = lines
+        self._lines    = tuple(lines)
         self.filename = filename
         self.startpos = startpos
         return self
 
-    @cached_attribute
-    def lines(self):
+    @cached_property
+    def lines(self) -> Tuple[str, ...]:
         r"""
         Lines that have been split by newline.
 
@@ -408,16 +420,19 @@ class FileText:
         :rtype:
           ``tuple`` of ``str``
         """
+        if self._lines is not None:
+            return self._lines
         # Used if only initialized with 'joined'.
         # We use str.split() instead of str.splitlines() because the latter
         # doesn't distinguish between strings that end in newline or not
         # (or requires extra work to process if we use splitlines(True)).
         return tuple(self.joined.split('\n'))
 
-    @cached_attribute
-    def joined(self): # used if only initialized with 'lines'
+    @cached_property
+    def joined(self) -> str:
         return '\n'.join(self.lines)
 
+
     @classmethod
     def from_filename(cls, filename):
         return cls.from_lines(Filename(filename))
@@ -435,13 +450,12 @@ class FileText:
             return self
         else:
             result = object.__new__(type(self))
-            result.lines    = self.lines
-            result.joined   = self.joined
+            result._lines   = self._lines
             result.filename = filename
             result.startpos = startpos
             return result
 
-    @cached_attribute
+    @cached_property
     def endpos(self):
         """
         The position after the last character in the text.