Fix ikotler#46 by guyadini: PEP8 Fixes + Replace except Exception, e with except Exception as e everywhere

ikotler · ikotler · commit ee1f4de071bf · 2012-09-02T12:50:38.000+03:00
diff --git a/pythonect/__init__.py b/pythonect/__init__.py
@@ -10,7 +10,7 @@
 
     del _version
 
-except ImportError, e:
+except ImportError as e:
 
     from internal.version import get_version
 
@@ -27,7 +27,7 @@
 
     from internal.eval import eval, parse
 
-except ImportError, e:
+except ImportError as e:
 
     # When imported by setup.py, it's expected that not all the dependencies will be there
 
diff --git a/pythonect/internal/eval.py b/pythonect/internal/eval.py
@@ -38,7 +38,7 @@ def __isiter(object):
 
         return True
 
-    except TypeError, e:
+    except TypeError as e:
 
         return False
 
@@ -115,7 +115,7 @@ def __run(expression, globals_, locals_, return_value_queue, iterate_literal_arr
 
         object_or_objects = python.eval(atom, globals_, locals_)
 
-    except NameError, e:
+    except NameError as e:
 
         try:
 
@@ -129,11 +129,11 @@ def __run(expression, globals_, locals_, return_value_queue, iterate_literal_arr
 
             object_or_objects = python.eval(atom, globals_, locals_)
 
-        except Exception, e1:
+        except Exception as e1:
 
             raise e1
 
-    except TypeError, e:
+    except TypeError as e:
 
         # Due to eval()?
 
diff --git a/pythonect/internal/lang.py b/pythonect/internal/lang.py
@@ -97,7 +97,7 @@ def evaluate_host(self, globals_, locals_):
 
             self.__host = eval(self.__host, globals_, locals_)
 
-        except SyntaxError, e:
+        except SyntaxError as e:
 
             # CONST? As it is
 
@@ -176,7 +176,7 @@ def __call__(self, globals_, locals_):
 
             exec self.__statement in globals_, locals_
 
-        except NameError, e:
+        except NameError as e:
 
                 try:
 
@@ -190,7 +190,7 @@ def __call__(self, globals_, locals_):
 
                     exec self.__statement in globals_, locals_
 
-                except Exception, e1:
+                except Exception as e1:
 
                     # raise original Exception
 
diff --git a/pythonect/internal/version.py b/pythonect/internal/version.py
@@ -34,7 +34,7 @@ def get_version():
 
                     version = version + '.post' + git_ver.group('POST')
 
-    except Exception, e:
+    except Exception as e:
 
         pass
 
diff --git a/pythonect/test/eval_test_gen.py b/pythonect/test/eval_test_gen.py
@@ -14,29 +14,29 @@
 import internal.eval
 
 
-ATOM = [ \
-        ('literal_underscore', '_'),
-        ('literal_true_expr', '1 == 1'),
-        ('literal_false_expr', '1 != 1'),
-        ('literal_int', '1'),
-        ('literal_float', '0.5'),
-        ('literal_string', '\"foobar\"'),
-        ('literal_true', 'True'),
-        ('literal_false', 'False'),
-        ('literal_none', 'None'),
-        ('import_stmt', 'import math'),
-        ('assignment_stmt', 'x = 0'),
-        ('python_expr', '1+1'),
-        ('pythonect_expr', '$[1->1]')
-        ]
-
-
-OPERATOR = [ \
-        (None, None),
-        ('comma', ','),
-        ('async', '->'),
-        ('sync', '|')
-        ]
+ATOM = [
+    ('literal_underscore', '_'),
+    ('literal_true_expr', '1 == 1'),
+    ('literal_false_expr', '1 != 1'),
+    ('literal_int', '1'),
+    ('literal_float', '0.5'),
+    ('literal_string', '\"foobar\"'),
+    ('literal_true', 'True'),
+    ('literal_false', 'False'),
+    ('literal_none', 'None'),
+    ('import_stmt', 'import math'),
+    ('assignment_stmt', 'x = 0'),
+    ('python_expr', '1+1'),
+    ('pythonect_expr', '$[1->1]')
+]
+
+
+OPERATOR = [
+    (None, None),
+    ('comma', ','),
+    ('async', '->'),
+    ('sync', '|')
+]
 
 
 # ATOM OPERATOR ATOM OPERATOR ATOM
@@ -103,9 +103,9 @@ def main():
         try:
 
             print '\tdef test_%s(self):\n\n\t\tself.assertEqual( internal.eval.eval(\'%s\', {}, {}) , %s )\n' % \
-                    ('_'.join(name), ' '.join(expr), __type_wrapper(internal.eval.eval(' '.join(expr), {}, {})))
+                ('_'.join(name), ' '.join(expr), __type_wrapper(internal.eval.eval(' '.join(expr), {}, {})))
 
-        except Exception, e:
+        except Exception as e:
 
             print "%s raises Exception %s" % (' '.join(expr), str(e))
 
