Rename TerminalPrinter to TokenPrinter

Author: dflook

src/python_minifier/expression_printer.py

@@ -3,7 +3,7 @@
 
 from python_minifier.util import is_ast_node
 
-from python_minifier.terminal_printer import TerminalPrinter, Delimiter
+from python_minifier.token_printer import TokenPrinter, Delimiter
 
 
 class ExpressionPrinter(object):
@@ -34,7 +34,7 @@ def __init__(self):
             'Tuple': 18, 'Set': 18, 'List': 18, 'Dict': 18, 'ListComp': 18, 'SetComp': 18, 'DictComp': 18, 'GeneratorExp': 18,  # Container
         }
 
-        self.printer = TerminalPrinter()
+        self.printer = TokenPrinter()
 
     def __call__(self, module):
         """

src/python_minifier/f_string.py

@@ -15,7 +15,7 @@
 from python_minifier.ast_compare import compare_ast
 from python_minifier.expression_printer import ExpressionPrinter
 from python_minifier.ministring import MiniString
-from python_minifier.terminal_printer import TokenTypes
+from python_minifier.token_printer import TokenTypes
 from python_minifier.util import is_ast_node
 
 

src/python_minifier/module_printer.py

@@ -2,7 +2,7 @@
 import sys
 
 from .expression_printer import ExpressionPrinter
-from .terminal_printer import Delimiter
+from .token_printer import Delimiter
 from .util import is_ast_node
 
 
@@ -523,7 +523,7 @@ def visit_ClassDef(self, node):
         self.printer.keyword('class')
         self.printer.identifier(node.name)
 
-        with Delimiter(self.printer, group_chars=('(', ')')) as delimiter:
+        with Delimiter(self.printer, add_parens=True) as delimiter:
 
             for b in node.bases:
                 delimiter.new_item()

src/python_minifier/terminal_printer.py src/python_minifier/token_printer.pysrc/python_minifier/terminal_printer.py renamed to src/python_minifier/token_printer.py

@@ -16,14 +16,14 @@ class TokenTypes(object):
     EndStatement = 9
 
 class Delimiter(object):
-    def __init__(self, terminal_printer, delimiter=',', group_chars=None):
+    def __init__(self, terminal_printer, delimiter=',', add_parens=False):
         """
         Delimited group printer
 
         A group of items that should be delimited by a delimiter character.
         Each call to new_item() will insert the delimiter character if necessary.
 
-        When used as a context manager, the group will be enclosed by the start and end characters.
+        When used as a context manager, the group will be enclosed by the start and end characters if the group has any items.
 
         >>> d = Delimiter(terminal_printer)
         ... d.new_item()
@@ -36,24 +36,22 @@ def __init__(self, terminal_printer, delimiter=',', group_chars=None):
         ... print(terminal_printer.code)
         a,b
 
-        >>> with Delimiter(terminal_printer, group_chars=('(', ')')) as d:
+        >>> with Delimiter(terminal_printer, add_parens=True) as d:
         ...     d.new_item()
         ...     terminal_printer.identifier('a')
         ... print(terminal_printer.code)
         (a)
 
         :param terminal_printer: The terminal printer to use.
         :param delimiter: The delimiter to use.
-        :param group_chars: The characters to use to open and close the delimited group.
+        :param add_parens: If the group should be enclosed by parentheses. Only used when used as a context manager.
         """
 
         self._terminal_printer = terminal_printer
         self._delimiter = delimiter
+        self._add_parens = add_parens
 
-        if group_chars:
-            self._start_char, self._end_char = group_chars
-
-        self.first = True
+        self._first = True
 
         self._context_manager = False
 
@@ -64,25 +62,23 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         """Close the delimited group."""
-        if not self.first and self._end_char:
-            self._terminal_printer.delimiter(self._end_char)
+        if not self._first and self._add_parens:
+            self._terminal_printer.delimiter(')')
 
     def new_item(self):
         """Add a new item to the delimited group."""
-        if self.first:
-            self.first = False
-            if self._context_manager and self._start_char:
-                self._terminal_printer.delimiter(self._start_char)
+        if self._first:
+            self._first = False
+            if self._context_manager and self._add_parens:
+                self._terminal_printer.delimiter('(')
         else:
             self._terminal_printer.delimiter(self._delimiter)
 
-class TerminalPrinter(object):
+class TokenPrinter(object):
     """
     Concatenates terminal symbols of the python grammar
     """
 
-    #__slots__ = ['__code', 'indent', 'unicode_literals', 'previous_token', '_prefer_single_line', '_allow_invalid_num_warnings']
-
     def __init__(self, prefer_single_line=False, allow_invalid_num_warnings=False):
         """
         :param prefer_single_line: If True, chooses to put as much code as possible on a single line.