Merge branch 'magic' into dev

This commit is contained in:
David Halter committed 2012-10-18 22:02:02 +02:00
commit 7b8988ebff
2 files changed
+6

No files matched your search

+3
View File
@@ -570,6 +570,9 @@ class Import(Simple):
else: else:
return [self.namespace] return [self.namespace]
def get_set_vars(self):
return self.get_defined_names()
def get_all_import_names(self): def get_all_import_names(self):
n = [] n = []
if self.from_ns: if self.from_ns:
+3
View File
@@ -86,6 +86,9 @@ from keyword import kwlist, \
#? ['kwlist'] #? ['kwlist']
kwlist kwlist
#? []
from keyword import not_existing1, not_existing2
from tokenize import io from tokenize import io
tokenize.generate_tokens tokenize.generate_tokens