Misc code cleanup.

andialbrecht · andialbrecht · commit 9c9f0c480971 · 2015-10-26T20:18:35.000+01:00
diff --git a/examples/column_defs_lowlevel.py b/examples/column_defs_lowlevel.py
@@ -29,9 +29,9 @@ def extract_definitions(token_list):
         idx = token_list.token_index(token)
         # grab the next token, this times including whitespace
         token = token_list.token_next(idx, skip_ws=False)
-        # split on ","
-        if (token is not None  # = end of statement
-            and token.match(sqlparse.tokens.Punctuation, ',')):
+        # split on ",", except when on end of statement
+        if token is not None \
+           and token.match(sqlparse.tokens.Punctuation, ','):
             definitions.append(tmp)
             tmp = []
             idx = token_list.token_index(token)
@@ -44,5 +44,5 @@ def extract_definitions(token_list):
 columns = extract_definitions(par)
 
 for column in columns:
-    print 'NAME: %-12s DEFINITION: %s' % (column[0],
-                                         ''.join(str(t) for t in column[1:]))
+    print('NAME: %-12s DEFINITION: %s' % (column[0],
+                                          ''.join(str(t) for t in column[1:])))
diff --git a/examples/extract_table_names.py b/examples/extract_table_names.py
@@ -57,4 +57,4 @@ def extract_tables():
 
 
 if __name__ == '__main__':
-    print 'Tables: %s' % ', '.join(extract_tables())
+    print('Tables: %s' % ', '.join(extract_tables()))
diff --git a/setup.py b/setup.py
@@ -17,11 +17,8 @@
 
 
 def get_version():
-    """parse __init__.py for version number instead of importing the file
-
-    see http://stackoverflow.com/questions/458550/standard-way-to-embed-version-into-python-package
-    """
-    VERSIONFILE='sqlparse/__init__.py'
+    """Parse __init__.py for version number instead of importing the file."""
+    VERSIONFILE = 'sqlparse/__init__.py'
     verstrline = open(VERSIONFILE, "rt").read()
     VSRE = r'^__version__ = [\'"]([^\'"]*)[\'"]'
     mo = re.search(VSRE, verstrline, re.M)

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,4 @@ def extract_tables():`
`57`	`57`
`58`	`58`
`59`	`59`	`if __name__ == '__main__':`
`60`		`- print 'Tables: %s' % ', '.join(extract_tables())`
	`60`	`+ print('Tables: %s' % ', '.join(extract_tables()))`