VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-07 22:44:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pep correct python code

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

67
pycomplete.py
View File

@@ -4,10 +4,10 @@ import pyclbr
import cStringIO import cStringIO
import sys import sys
import types 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 from pyfuzzyparser import PyFuzzyParser, _sanitize
def complete(file_name, line, colon): def complete(file_name, line, colon):
options = [] options = []
print file_name, line, colon print file_name, line, colon
@@ -24,12 +24,14 @@ def complete(file_name, line, colon):
pass pass
return options return options
print 1 print 1
if __name__ == '__main__': if __name__ == '__main__':
#print complete('test.py', 50, 3) #print complete('test.py', 50, 3)
#print complete('test.py', 51, 10) #print complete('test.py', 51, 10)
pass pass
class Completer(object): class Completer(object):
def __init__(self): def __init__(self):
self.compldict = {} self.compldict = {}
@@ -52,17 +54,22 @@ class Completer(object):
def get_arguments(self, func_obj): def get_arguments(self, func_obj):
def _ctor(obj): def _ctor(obj):
try: return class_ob.__init__.im_func try:
return class_ob.__init__.im_func
except AttributeError: except AttributeError:
for base in class_ob.__bases__: for base in class_ob.__bases__:
rc = _find_constructor(base) rc = _find_constructor(base)
if rc is not None: return rc if rc is not None:
return rc
return None return None
arg_offset = 1 arg_offset = 1
if type(func_obj) == types.ClassType: func_obj = _ctor(func_obj) if type(func_obj) == types.ClassType:
elif type(func_obj) == types.MethodType: func_obj = func_obj.im_func func_obj = _ctor(func_obj)
else: arg_offset = 0 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]: if type(func_obj) in [types.FunctionType, types.LambdaType]:
@@ -96,14 +103,17 @@ class Completer(object):
ridx = sigline.find(')') ridx = sigline.find(')')
if lidx > 0 and ridx > 0: if lidx > 0 and ridx > 0:
arg_text = sigline[lidx + 1:ridx] + ')' arg_text = sigline[lidx + 1:ridx] + ')'
if len(arg_text) == 0: arg_text = ')' if len(arg_text) == 0:
arg_text = ')'
return arg_text return arg_text
def get_completions(self, context, match): def get_completions(self, context, match):
dbg("get_completions('%s','%s')" % (context, match)) dbg("get_completions('%s','%s')" % (context, match))
stmt = '' stmt = ''
if context: stmt += str(context) if context:
if match: stmt += str(match) stmt += str(context)
if match:
stmt += str(match)
try: try:
result = None result = None
all = {} all = {}
@@ -111,7 +121,8 @@ class Completer(object):
if len(stmt) > 0 and stmt[-1] == '(': if len(stmt) > 0 and stmt[-1] == '(':
result = eval(_sanitize(stmt[:-1]), self.compldict) result = eval(_sanitize(stmt[:-1]), self.compldict)
doc = result.__doc__ doc = result.__doc__
if doc is None: doc = '' if doc is None:
doc = ''
args = self.get_arguments(result) 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: elif ridx == -1:
@@ -126,20 +137,29 @@ class Completer(object):
dbg("completing: stmt:%s" % stmt) dbg("completing: stmt:%s" % stmt)
completions = [] completions = []
try: maindoc = result.__doc__ try:
except: maindoc = ' ' maindoc = result.__doc__
if maindoc is None: maindoc = ' ' except:
maindoc = ' '
if maindoc is None:
maindoc = ' '
for m in all: for m in all:
if m == "_PyCmplNoType": continue #this is internal if m == "_PyCmplNoType":
continue # this is internal
try: try:
dbg('possible completion: %s' % m) dbg('possible completion: %s' % m)
if m.find(match) == 0: if m.find(match) == 0:
if result is None: inst = all[m] if result is None:
else: inst = getattr(result,m) inst = all[m]
try: doc = inst.__doc__ else:
except: doc = maindoc inst = getattr(result, m)
try:
doc = inst.__doc__
except:
doc = maindoc
typestr = str(inst) typestr = str(inst)
if doc is None or doc == '': doc = maindoc if doc is None or doc == '':
doc = maindoc
wrd = m[len(match):] wrd = m[len(match):]
c = {'word': wrd, 'abbr': m, 'info': self._cleanstr(doc)} c = {'word': wrd, 'abbr': m, 'info': self._cleanstr(doc)}
@@ -165,11 +185,14 @@ class Completer(object):
return [] return []
debugstmts = [] debugstmts = []
def dbg(s): debugstmts.append(s) def dbg(s):
def showdbg(): debugstmts.append(s)
for d in debugstmts: print "DBG: %s " % d
def showdbg():
for d in debugstmts:
print "DBG: %s " % d
text = cStringIO.StringIO(open('test.py').read()) text = cStringIO.StringIO(open('test.py').read())
cmpl = Completer() cmpl = Completer()

82
pyfuzzyparser.py
View File

@@ -5,11 +5,13 @@ import sys
import tokenize import tokenize
import cStringIO import cStringIO
def indent_block(text, indention=" "): def indent_block(text, indention=" "):
""" This function indents a text block with a default of four spaces """ """ This function indents a text block with a default of four spaces """
lines = text.split('\n') lines = text.split('\n')
return '\n'.join(map(lambda s: indention + s, lines)) return '\n'.join(map(lambda s: indention + s, lines))
class Scope(object): class Scope(object):
def __init__(self, name, indent, docstr=''): def __init__(self, name, indent, docstr=''):
self.subscopes = [] self.subscopes = []
@@ -30,9 +32,12 @@ class Scope(object):
""" Clean up a docstring """ """ Clean up a docstring """
d = str.replace('\n', ' ') d = str.replace('\n', ' ')
d = d.replace('\t', ' ') d = d.replace('\t', ' ')
while d.find(' ') > -1: d = d.replace(' ',' ') while d.find(' ') > -1:
while d[0] in '"\'\t ': d = d[1:] d = d.replace(' ', ' ')
while d[-1] in '"\'\t ': d = d[:-1] while d[0] in '"\'\t ':
d = d[1:]
while d[-1] in '"\'\t ':
d = d[:-1]
dbg("Scope(%s)::docstr = %s" % (self, d)) dbg("Scope(%s)::docstr = %s" % (self, d))
self.docstr = d self.docstr = d
@@ -52,17 +57,17 @@ class Scope(object):
def get_code(self, first_indent=False, indention=" "): def get_code(self, first_indent=False, indention=" "):
str = "" str = ""
#str += 'class _PyCmplNoType:\n def __getattr__(self,name):\n return None\n' if len(self.docstr) > 0:
if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n' str += '"""' + self.docstr + '"""\n'
for i in self.imports: for i in self.imports:
str += i.get_code() + '\n' str += i.get_code() + '\n'
#str += 'class _PyCmplNoType:\n def __getattr__(self,name):\n return None\n'
for sub in self.subscopes: for sub in self.subscopes:
str += sub.get_code(first_indent=True, indention=indention) str += sub.get_code(first_indent=True, indention=indention)
for l in self.locals: for l in self.locals:
str += l + '\n' str += l + '\n'
if first_indent: str = indent_block(str, indention = indention) if first_indent:
str = indent_block(str, indention=indention)
return "_%s_%s" % (self.indent, str) return "_%s_%s" % (self.indent, str)
def is_empty(self): def is_empty(self):
@@ -71,6 +76,7 @@ class Scope(object):
""" """
return not (self.locals, self.imports, self.subscopes) return not (self.locals, self.imports, self.subscopes)
class Class(Scope): class Class(Scope):
def __init__(self, name, supers, indent, docstr=''): def __init__(self, name, supers, indent, docstr=''):
super(Class, self).__init__(name, indent, docstr) super(Class, self).__init__(name, indent, docstr)
@@ -78,7 +84,8 @@ class Class(Scope):
def get_code(self, first_indent=False, indention=" "): def get_code(self, first_indent=False, indention=" "):
str = 'class %s' % (self.name) str = 'class %s' % (self.name)
if len(self.supers) > 0: str += '(%s)' % ','.join(self.supers) if len(self.supers) > 0:
str += '(%s)' % ','.join(self.supers)
str += ':\n' str += ':\n'
str += super(Class, self).get_code(True, indention) str += super(Class, self).get_code(True, indention)
if self.is_empty(): if self.is_empty():
@@ -93,13 +100,15 @@ class Function(Scope):
def get_code(self, first_indent=False, indention=" "): def get_code(self, first_indent=False, indention=" "):
str = "def %s(%s):\n" % (self.name, ','.join(self.params)) str = "def %s(%s):\n" % (self.name, ','.join(self.params))
#if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n' #if len(self.docstr) > 0:
# str += self.childindent()+'"""'+self.docstr+'"""\n'
str += super(Function, self).get_code(True, indention) str += super(Function, self).get_code(True, indention)
if self.is_empty(): if self.is_empty():
str += indent_block("pass\n", indention=indention) str += indent_block("pass\n", indention=indention)
print "func", self.locals print "func", self.locals
return str return str
class Import(object): class Import(object):
""" """
stores the imports of class files stores the imports of class files
@@ -128,6 +137,7 @@ class Import(object):
else: else:
return "test import " + ns_str return "test import " + ns_str
class PyFuzzyParser(object): class PyFuzzyParser(object):
""" """
This class is used to parse a Python file, it then divides them into a This class is used to parse a Python file, it then divides them into a
@@ -144,13 +154,16 @@ class PyFuzzyParser(object):
tokentype, tok, indent = self.next() tokentype, tok, indent = self.next()
if tokentype != tokenize.NAME and tok != '*': if tokentype != tokenize.NAME and tok != '*':
return ('', tok) return ('', tok)
else: tok = pre else:
tok = pre
name.append(tok) name.append(tok)
while True: while True:
tokentype, tok, indent = self.next() tokentype, tok, indent = self.next()
if tok != '.': break if tok != '.':
break
tokentype, tok, indent = self.next() tokentype, tok, indent = self.next()
if tokentype != tokenize.NAME: break if tokentype != tokenize.NAME:
break
name.append(tok) name.append(tok)
return (".".join(name), tok) return (".".join(name), tok)
@@ -158,13 +171,16 @@ class PyFuzzyParser(object):
imports = [] imports = []
while True: while True:
name, tok = self._parsedotname() name, tok = self._parsedotname()
if not name: break if not name:
break
name2 = '' name2 = ''
if tok == 'as': name2, tok = self._parsedotname() if tok == 'as':
name2, tok = self._parsedotname()
imports.append((name, name2)) imports.append((name, name2))
while tok != "," and "\n" not in tok: while tok != "," and "\n" not in tok:
tokentype, tok, indent = self.next() tokentype, tok, indent = self.next()
if tok != ",": break if tok != ",":
break
return imports return imports
def _parseparen(self): def _parseparen(self):
@@ -174,7 +190,8 @@ class PyFuzzyParser(object):
while True: while True:
tokentype, tok, indent = self.next() tokentype, tok, indent = self.next()
if tok in (')', ',') and level == 1: if tok in (')', ',') and level == 1:
if '=' not in name: name = name.replace(' ', '') if '=' not in name:
name = name.replace(' ', '')
names.append(name.strip()) names.append(name.strip())
name = '' name = ''
if tok == '(': if tok == '(':
@@ -182,8 +199,10 @@ class PyFuzzyParser(object):
name += "(" name += "("
elif tok == ')': elif tok == ')':
level -= 1 level -= 1
if level == 0: break if level == 0:
else: name += ")" break
else:
name += ")"
elif tok == ',' and level == 1: elif tok == ',' and level == 1:
pass pass
else: else:
@@ -192,26 +211,31 @@ class PyFuzzyParser(object):
def _parsefunction(self, indent): def _parsefunction(self, indent):
tokentype, fname, ind = self.next() tokentype, fname, ind = self.next()
if tokentype != tokenize.NAME: return None if tokentype != tokenize.NAME:
return None
tokentype, open, ind = self.next() tokentype, open, ind = self.next()
if open != '(': return None if open != '(':
return None
params = self._parseparen() params = self._parseparen()
tokentype, colon, ind = self.next() tokentype, colon, ind = self.next()
if colon != ':': return None if colon != ':':
return None
return Function(fname, params, indent) return Function(fname, params, indent)
def _parseclass(self, indent): def _parseclass(self, indent):
tokentype, cname, ind = self.next() tokentype, cname, ind = self.next()
if tokentype != tokenize.NAME: return None if tokentype != tokenize.NAME:
return None
super = [] super = []
tokentype, next, ind = self.next() tokentype, next, ind = self.next()
if next == '(': if next == '(':
super = self._parseparen() super = self._parseparen()
elif next != ':': return None elif next != ':':
return None
return Class(cname, super, indent) return Class(cname, super, indent)
@@ -243,16 +267,17 @@ class PyFuzzyParser(object):
level += 1 level += 1
elif tok in (']', '}', ')'): elif tok in (']', '}', ')'):
level -= 1 level -= 1
if level == 0: break if level == 0:
break
elif level == 0: elif level == 0:
if tok in (';','\n'): break if tok in (';', '\n'):
break
assign += tok assign += tok
return "%s" % assign return "%s" % assign
def next(self): def next(self):
type, tok, (lineno, indent), end, self.parserline = self.gen.next() type, tok, (lineno, indent), end, self.parserline = self.gen.next()
if lineno == self.curline: if lineno == self.curline:
#print 'line found [%s] scope=%s' % (line.replace('\n',''),self.scope.name)
self.currentscope = self.scope self.currentscope = self.scope
return (type, tok, indent) return (type, tok, indent)
@@ -302,7 +327,8 @@ class PyFuzzyParser(object):
self.scope.add_import(Import(name, alias, mod)) self.scope.add_import(Import(name, alias, mod))
freshscope = False freshscope = False
elif tokentype == tokenize.STRING: elif tokentype == tokenize.STRING:
if freshscope: self.scope.doc(tok) if freshscope:
self.scope.doc(tok)
elif tokentype == tokenize.NAME: elif tokentype == tokenize.NAME:
name, tok = self._parsedotname(tok) name, tok = self._parsedotname(tok)
if tok == '=': if tok == '=':
@@ -318,6 +344,7 @@ class PyFuzzyParser(object):
# (sys.exc_info()[0], sys.exc_info()[1], self.parserline)) # (sys.exc_info()[0], sys.exc_info()[1], self.parserline))
return self.top # self._adjustvisibility() return self.top # self._adjustvisibility()
def _sanitize(str): def _sanitize(str):
val = '' val = ''
level = 0 level = 0
@@ -330,5 +357,6 @@ def _sanitize(str):
val += c val += c
return val return val
def dbg(*args): def dbg(*args):
print args print args