Remove unnecessary parens around yield (#834)

[etc/vim.git] / blib2to3 / pgen2 / driver.py

diff --git a/blib2to3/pgen2/driver.py b/blib2to3/pgen2/driver.py
index a51ffc30b9fe9195c1ff936d403387e7fe8b4110..63b60bbad56f533924752f2dd86aea148ffd4f5a 100644 (file)
--- a/blib2to3/pgen2/driver.py
+++ b/blib2to3/pgen2/driver.py
@@ -32,7 +32,7 @@ class Driver(object):
     def __init__(self, grammar, convert=None, logger=None):
         self.grammar = grammar
         if logger is None:
     def __init__(self, grammar, convert=None, logger=None):
         self.grammar = grammar
         if logger is None:

-            logger = logging.getLogger()
+            logger = logging.getLogger(__name__)

         self.logger = logger
         self.convert = convert
 
         self.logger = logger
         self.convert = convert
 


@@ -131,12 +131,10 @@ class Driver(object):
                     current_line = ""
                     current_column = 0
                     wait_for_nl = False
                     current_line = ""
                     current_column = 0
                     wait_for_nl = False

-            elif char == ' ':
+            elif char in ' \t':

                 current_column += 1
                 current_column += 1

-            elif char == '\t':
-                current_column += 4

             elif char == '\n':
             elif char == '\n':

-                # enexpected empty line
+                # unexpected empty line

                 current_column = 0
             else:
                 # indent is finished
                 current_column = 0
             else:
                 # indent is finished


@@ -159,7 +157,7 @@ def load_grammar(gt="Grammar.txt", gp=None,
                  save=True, force=False, logger=None):
     """Load the grammar (maybe from a pickle)."""
     if logger is None:
                  save=True, force=False, logger=None):
     """Load the grammar (maybe from a pickle)."""
     if logger is None:

-        logger = logging.getLogger()
+        logger = logging.getLogger(__name__)

     gp = _generate_pickle_name(gt) if gp is None else gp
     if force or not _newer(gp, gt):
         logger.info("Generating grammar tables from %s", gt)
     gp = _generate_pickle_name(gt) if gp is None else gp
     if force or not _newer(gp, gt):
         logger.info("Generating grammar tables from %s", gt)