Skip to content

Fix: Ensure ModulePrinter respects the indent_char argument #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Ensure ModulePrinter respects the indent_char argument #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/python_minifier/module_printer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ModulePrinter(ExpressionPrinter):

def __init__(self, indent_char='\t'):
super(ModulePrinter, self).__init__()
self.indent_char = indent_char
self.printer.indent_char = indent_char

def __call__(self, module):
"""
Expand All @@ -30,13 +30,13 @@ def __call__(self, module):
self.visit_Module(module)
# 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 + ';')
return code.rstrip('\n' + self.printer.indent_char + ';')

@property
def code(self):
# 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 + ';')
return code.rstrip('\n' + self.printer.indent_char + ';')

# region Simple Statements

Expand Down
5 changes: 3 additions & 2 deletions src/python_minifier/token_printer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def __init__(self, prefer_single_line=False, allow_invalid_num_warnings=False):
self.indent = 0
self.unicode_literals = False
self.previous_token = TokenTypes.NoToken
self.indent_char = '\t'

def __str__(self):
"""Return the output code."""
Expand Down Expand Up @@ -287,9 +288,9 @@ def newline(self):
if self._code == '':
return

self._code = self._code.rstrip('\n\t;')
self._code = self._code.rstrip('\n;' + self.indent_char)
self._code += '\n'
self._code += '\t' * self.indent
self._code += self.indent_char * self.indent

self.previous_token = TokenTypes.NewLine

Expand Down