Merge branch 'magic' into dev

This commit is contained in:
David Halter
2012-10-18 22:02:02 +02:00
2 changed files with 6 additions and 0 deletions

View File

@@ -570,6 +570,9 @@ class Import(Simple):
else:
return [self.namespace]
def get_set_vars(self):
return self.get_defined_names()
def get_all_import_names(self):
n = []
if self.from_ns:

View File

@@ -86,6 +86,9 @@ from keyword import kwlist, \
#? ['kwlist']
kwlist
#? []
from keyword import not_existing1, not_existing2
from tokenize import io
tokenize.generate_tokens