Commit592d215

committed

import completion returns unicode

1 parentb4cee82 commit592d215Copy full SHA for 592d215

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,14 +166,15 @@ def find_all_modules(path=None):`
`166`	`166`	"""Return a list with all modules in `path`, which should be a list of
`167`	`167`	`directory names. If path is not given, sys.path will be used."""`
`168`	`168`	`ifpathisNone:`
`169`		`-modules.update(sys.builtin_module_names)`
	`169`	`+modules.update(try_decode(m,'ascii')`
	`170`	`+forminsys.builtin_module_names)`
`170`	`171`	`path=sys.path`
`171`	`172`
`172`	`173`	`forpinpath:`
`173`	`174`	`ifnotp:`
`174`	`175`	`p=os.curdir`
`175`	`176`	`formoduleinfind_modules(p):`
`176`		`-module=try_decode(module,sys.getfilesystemencoding())`
	`177`	`+module=try_decode(module,'ascii')`
`177`	`178`	`ifmoduleisNone:`
`178`	`179`	`continue`
`179`	`180`	`modules.add(module)`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,26 +10,27 @@ class TestSimpleComplete(unittest.TestCase):`
`10`	`10`
`11`	`11`	`defsetUp(self):`
`12`	`12`	`self.original_modules=importcompletion.modules`
`13`		`-importcompletion.modules= ['zzabc','zzabd','zzefg','zzabc.e',`
`14`		`-'zzabc.f']`
	`13`	`+importcompletion.modules= [u'zzabc',u'zzabd',u'zzefg',u'zzabc.e',`
	`14`	`+u'zzabc.f']`
`15`	`15`
`16`	`16`	`deftearDown(self):`
`17`	`17`	`importcompletion.modules=self.original_modules`
`18`	`18`
`19`	`19`	`deftest_simple_completion(self):`
`20`	`20`	`self.assertSetEqual(importcompletion.complete(10,'import zza'),`
`21`		`-set(['zzabc','zzabd']))`
	`21`	`+set([u'zzabc',u'zzabd']))`
`22`	`22`
`23`	`23`	`deftest_package_completion(self):`
`24`	`24`	`self.assertSetEqual(importcompletion.complete(13,'import zzabc.'),`
`25`		`-set(['zzabc.e','zzabc.f']))`
	`25`	`+set([u'zzabc.e',u'zzabc.f']))`
`26`	`26`
`27`	`27`
`28`	`28`	`classTestRealComplete(unittest.TestCase):`
`29`	`29`
`30`	`30`	`@classmethod`
`31`	`31`	`defsetUpClass(cls):`
`32`		`- [_for_inimportcompletion.find_iterator]`
	`32`	`+for_inimportcompletion.find_iterator:`
	`33`	`+pass`
`33`	`34`	`__import__('sys')`
`34`	`35`	`__import__('os')`
`35`	`36`

Comments

(0)