Commita82b4b5

llllllllll

committed

Makes the old-style class autocomplete work in 2.6 and 3.x

1 parentcb90872 commita82b4b5Copy full SHA for a82b4b5

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`importre`
`34`	`34`	`importrlcompleter`
`35`	`35`	`importsys`
`36`		`-fromtypesimportInstanceType,ClassType`
`37`	`36`	`fromsix.movesimportrange,builtins`
`38`	`37`	`fromsiximportstring_types,iteritems`
`39`	`38`
`@@ -43,6 +42,9 @@`
`43`	`42`	`frombpython._py3compatimportpy3,try_decode`
`44`	`43`	`frombpython.lazyreimportLazyReCompile`
`45`	`44`
	`45`	`+ifnotpy3:`
	`46`	`+fromtypesimportInstanceType,ClassType`
	`47`	`+`
`46`	`48`
`47`	`49`	`# Autocomplete modes`
`48`	`50`	`SIMPLE='simple'`
`@@ -540,7 +542,7 @@ def attr_lookup(obj, expr, attr):`
`540`	`542`	`words.remove('__abstractmethods__')`
`541`	`543`	`exceptValueError:`
`542`	`544`	`pass`
`543`		`-ifisinstance(obj, (InstanceType,ClassType)):`
	`545`	`+ifnotpy3andisinstance(obj, (InstanceType,ClassType)):`
`544`	`546`	`# Account for the __dict__ in an old-style class.`
`545`	`547`	`words.append('__dict__')`
`546`	`548`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ def test_att_matches_found_on_instance(self):`
`242`	`242`	`deftest_att_matches_found_on_old_style_instance(self):`
`243`	`243`	`self.assertSetEqual(self.com.matches(2,'a.',`
`244`	`244`	`locals_={'a':OldStyleFoo()}),`
`245`		`-{'a.method','a.a','a.b'})`
	`245`	`+set(['a.method','a.a','a.b']))`
`246`	`246`	`self.assertIn(u'a.__dict__',`
`247`	`247`	`self.com.matches(3,'a._',locals_={'a':OldStyleFoo()}))`
`248`	`248`

Comments

(0)