pep correct python code

This commit is contained in:
David Halter
2012-02-21 00:21:00 +01:00
parent 49b7e778ce
commit 7597ed05a0
2 changed files with 157 additions and 106 deletions

View File

@@ -4,10 +4,10 @@ import pyclbr
import cStringIO
import sys
import types
from token import ENDMARKER , NT_OFFSET , NUMBER , STRING , NEWLINE , INDENT , DEDENT , LPAR , RPAR , LSQB , RSQB , COLON , COMMA , SEMI , PLUS , MINUS , STAR , SLASH , VBAR , AMPER , LESS , GREATER , EQUAL , DOT , PERCENT , BACKQUOTE , LBRACE , RBRACE , EQEQUAL , NOTEQUAL , LESSEQUAL , GREATEREQUAL , TILDE , CIRCUMFLEX , LEFTSHIFT , RIGHTSHIFT , DOUBLESTAR , PLUSEQUAL , MINEQUAL , STAREQUAL , SLASHEQUAL , PERCENTEQUAL , AMPEREQUAL , VBAREQUAL , CIRCUMFLEXEQUAL , LEFTSHIFTEQUAL , RIGHTSHIFTEQUAL , DOUBLESTAREQUAL , DOUBLESLASH , DOUBLESLASHEQUAL , AT , NAME , ERRORTOKEN , N_TOKENS , OP
from pyfuzzyparser import PyFuzzyParser, _sanitize
def complete(file_name, line, colon):
options = []
print file_name, line, colon
@@ -24,55 +24,62 @@ def complete(file_name, line, colon):
pass
return options
print 1
if __name__ == '__main__':
#print complete('test.py', 50, 3)
#print complete('test.py', 51, 10)
pass
class Completer(object):
def __init__(self):
self.compldict = {}
self.parser = PyFuzzyParser()
self.compldict = {}
self.parser = PyFuzzyParser()
def evalsource(self,text,line=0):
sc = self.parser.parse(text,line)
self.sc = sc # TODO rm
def evalsource(self, text, line=0):
sc = self.parser.parse(text, line)
self.sc = sc # TODO rm
src = sc.get_code()
dbg("source: %s" % src)
#try: exec(src) in self.compldict
#except: dbg("parser: %s, %s" % (sys.exc_info()[0],sys.exc_info()[1]))
#except: dbg("parser: %s, %s" % (sys.exc_info()[0], sys.exc_info()[1]))
#for l in sc.locals:
# dbg("local: %s" % l)
# try: exec(l) in self.compldict
# except: dbg("locals: %s, %s [%s]" % (sys.exc_info()[0],sys.exc_info()[1],l))
# except: dbg("locals: %s, %s [%s]" % (sys.exc_info()[0], sys.exc_info()[1], l))
def _cleanstr(self,doc):
return doc.replace('"',' ').replace("'",' ')
def _cleanstr(self, doc):
return doc.replace('"', ' ').replace("'", ' ')
def get_arguments(self,func_obj):
def get_arguments(self, func_obj):
def _ctor(obj):
try: return class_ob.__init__.im_func
try:
return class_ob.__init__.im_func
except AttributeError:
for base in class_ob.__bases__:
rc = _find_constructor(base)
if rc is not None: return rc
if rc is not None:
return rc
return None
arg_offset = 1
if type(func_obj) == types.ClassType: func_obj = _ctor(func_obj)
elif type(func_obj) == types.MethodType: func_obj = func_obj.im_func
else: arg_offset = 0
if type(func_obj) == types.ClassType:
func_obj = _ctor(func_obj)
elif type(func_obj) == types.MethodType:
func_obj = func_obj.im_func
else:
arg_offset = 0
arg_text=''
arg_text = ''
if type(func_obj) in [types.FunctionType, types.LambdaType]:
try:
cd = func_obj.func_code
real_args = cd.co_varnames[arg_offset:cd.co_argcount]
defaults = func_obj.func_defaults or ''
defaults = map(lambda name: "=%s" % name, defaults)
defaults = [""] * (len(real_args)-len(defaults)) + defaults
items = map(lambda a,d: a+d, real_args, defaults)
defaults = [""] * (len(real_args) - len(defaults)) + defaults
items = map(lambda a, d: a + d, real_args, defaults)
if func_obj.func_code.co_flags & 0x4:
items.append("...")
if func_obj.func_code.co_flags & 0x8:
@@ -80,7 +87,7 @@ class Completer(object):
arg_text = (','.join(items)) + ')'
except:
dbg("arg completion: %s: %s" % (sys.exc_info()[0],sys.exc_info()[1]))
dbg("arg completion: %s: %s" % (sys.exc_info()[0], sys.exc_info()[1]))
pass
if len(arg_text) == 0:
# The doc string sometimes contains the function signature
@@ -95,15 +102,18 @@ class Completer(object):
lidx = sigline.find('(')
ridx = sigline.find(')')
if lidx > 0 and ridx > 0:
arg_text = sigline[lidx+1:ridx] + ')'
if len(arg_text) == 0: arg_text = ')'
arg_text = sigline[lidx + 1:ridx] + ')'
if len(arg_text) == 0:
arg_text = ')'
return arg_text
def get_completions(self,context,match):
dbg("get_completions('%s','%s')" % (context,match))
def get_completions(self, context, match):
dbg("get_completions('%s','%s')" % (context, match))
stmt = ''
if context: stmt += str(context)
if match: stmt += str(match)
if context:
stmt += str(context)
if match:
stmt += str(match)
try:
result = None
all = {}
@@ -111,14 +121,15 @@ class Completer(object):
if len(stmt) > 0 and stmt[-1] == '(':
result = eval(_sanitize(stmt[:-1]), self.compldict)
doc = result.__doc__
if doc is None: doc = ''
if doc is None:
doc = ''
args = self.get_arguments(result)
return [{'word':self._cleanstr(args),'info':self._cleanstr(doc)}]
return [{'word': self._cleanstr(args), 'info': self._cleanstr(doc)}]
elif ridx == -1:
match = stmt
all = self.compldict
else:
match = stmt[ridx+1:]
match = stmt[ridx + 1:]
stmt = _sanitize(stmt[:ridx])
result = eval(stmt, self.compldict)
all = dir(result)
@@ -126,23 +137,32 @@ class Completer(object):
dbg("completing: stmt:%s" % stmt)
completions = []
try: maindoc = result.__doc__
except: maindoc = ' '
if maindoc is None: maindoc = ' '
try:
maindoc = result.__doc__
except:
maindoc = ' '
if maindoc is None:
maindoc = ' '
for m in all:
if m == "_PyCmplNoType": continue #this is internal
if m == "_PyCmplNoType":
continue # this is internal
try:
dbg('possible completion: %s' % m)
if m.find(match) == 0:
if result is None: inst = all[m]
else: inst = getattr(result,m)
try: doc = inst.__doc__
except: doc = maindoc
if result is None:
inst = all[m]
else:
inst = getattr(result, m)
try:
doc = inst.__doc__
except:
doc = maindoc
typestr = str(inst)
if doc is None or doc == '': doc = maindoc
if doc is None or doc == '':
doc = maindoc
wrd = m[len(match):]
c = {'word':wrd, 'abbr':m, 'info':self._cleanstr(doc)}
c = {'word': wrd, 'abbr': m, 'info': self._cleanstr(doc)}
if "function" in typestr:
c['word'] += '('
c['abbr'] += '(' + self._cleanstr(self.get_arguments(inst))
@@ -157,23 +177,26 @@ class Completer(object):
completions.append(c)
except:
i = sys.exc_info()
dbg("inner completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
dbg("inner completion: %s, %s [stmt='%s']" % (i[0], i[1], stmt))
return completions
except:
i = sys.exc_info()
dbg("completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
dbg("completion: %s, %s [stmt='%s']" % (i[0], i[1], stmt))
return []
debugstmts=[]
def dbg(s): debugstmts.append(s)
def showdbg():
for d in debugstmts: print "DBG: %s " % d
debugstmts = []
def dbg(s):
debugstmts.append(s)
def showdbg():
for d in debugstmts:
print "DBG: %s " % d
text = cStringIO.StringIO(open('test.py').read())
cmpl = Completer()
cmpl.evalsource(text,51)
cmpl.evalsource(text, 51)
print cmpl.sc.get_code()
all = cmpl.get_completions("cdef.", '')