Merge.

Trundle · Trundle · commit 12b3d3347426 · 2010-04-26T20:14:56.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1047,7 +1047,7 @@ def reevaluate(self):
             self.iy, self.ix = self.scr.getyx()
 
         self.cpos = 0
-        indent = next_indentation(self.s, self.config.tab_length)
+        indent = repl.next_indentation(self.s, self.config.tab_length)
         self.s = ''
         self.scr.refresh()
 
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -24,6 +24,7 @@
 from __future__ import with_statement
 import collections
 import inspect
+import keyword
 import pydoc
 import re
 import sys
@@ -232,9 +233,11 @@ def getargspec(func, f):
 
 def is_eval_safe_name(string):
     if py3:
-        return all(part.isidentifier() for part in string.split('.'))
+        return all(part.isidentifier() and not keyword.iskeyword(part)
+                   for part in string.split('.'))
     else:
-        return all(_name.match(part) for part in string.split('.'))
+        return all(_name.match(part) and not keyword.iskeyword(part)
+                   for part in string.split('.'))
 
 
 def is_callable(obj):
