bpython
diff --git a/‎bpython/autocomplete.py‎
Lines changed: 2 additions & 2 deletions b/‎bpython/autocomplete.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎bpython/cli.py‎
Lines changed: 1 addition & 1 deletion b/‎bpython/cli.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bpython/curtsiesfrontend/repl.py‎
Lines changed: 4 additions & 4 deletions b/‎bpython/curtsiesfrontend/repl.py‎
Lines changed: 4 additions & 4 deletions
@@ -341,9 +341,9 @@ def safe_eval(expr, namespace):
     try:
         obj = eval(expr, namespace)
         return obj
-    except (NameError, AttributeError, SyntaxError) as e:
+    except (NameError, AttributeError, SyntaxError):
         # If debugging safe_eval, raise this!
-        # raise e
+        # raise
         return SafeEvalFailed
 
 def attr_matches(text, namespace, autocomplete_mode):
 
@@ -975,7 +975,7 @@ def p_key(self, key):
                 page(source)
             except (ValueError, AttributeError, IOError, TypeError), e:
                 self.statusbar.message(_(e))
-            except (NameError), e:
+            except NameError, e:
                 self.statusbar.message(_('Cannot get source: %s' % e))
             return ''
 
 
@@ -349,9 +349,9 @@ def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
                     if name in old_module_locations:
                         loc = old_module_locations[name]
                         if self.watching_files:
-                            self.watcher.add_module(old_module_locations[name])
+                            self.watcher.add_module(loc)
                         else:
-                            self.watcher.add_module_later(old_module_locations[name])
+                            self.watcher.add_module_later(loc)
                     raise
                 else:
                     if hasattr(m, "__file__"):
@@ -1308,9 +1308,9 @@ def show_source(self):
             self.pager(source)
         except (ValueError, AttributeError, IOError, TypeError), e:
             self.status_bar.message(_(e))
-        except (NameError), e:
+        except NameError, e:
             self.status_bar.message(_('Cannot get source: %s' % e))
-        
+
     def help_text(self):
         return (self.version_help_text() + '\n' + self.key_help_text()).encode('utf8')