VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

little changes to clean up the code (flake8)

Browse Source
This commit is contained in:
Dave Halter
2014-02-14 12:53:22 +01:00
parent d704743422
commit 82f27569b2
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jedi/parser/token.py
View File

@@ -40,9 +40,7 @@ class Token(object):
>>> unicode(Token(1, utf8("😷"), 1 ,1)) + "p" == utf8("😷p") >>> unicode(Token(1, utf8("😷"), 1 ,1)) + "p" == utf8("😷p")
True True
""" """
__slots__ = [ __slots__ = ("_token_type", "_token", "_start_pos_line", "_start_pos_col")
"_token_type", "_token", "_start_pos_line", "_start_pos_col"
]
@classmethod @classmethod
def from_tuple(cls, tp): def from_tuple(cls, tp):
@@ -51,10 +49,10 @@ class Token(object):
def __init__( def __init__(
self, token_type, token, start_pos_line, start_pos_col self, token_type, token, start_pos_line, start_pos_col
): ):
self._token_type = token_type self._token_type = token_type
self._token = token self._token = token
self._start_pos_line = start_pos_line self._start_pos_line = start_pos_line
self._start_pos_col = start_pos_col self._start_pos_col = start_pos_col
def __repr__(self): def __repr__(self):
return "<%s: %s>" % (type(self).__name__, tuple(self)) return "<%s: %s>" % (type(self).__name__, tuple(self))
@@ -108,15 +106,15 @@ class Token(object):
@property @property
def end_pos(self): def end_pos(self):
"""Returns end position respecting multiline tokens.""" """Returns end position respecting multiline tokens."""
end_pos_line = self.start_pos_line end_pos_line = self.start_pos_line
lines = unicode(self).split('\n') lines = unicode(self).split('\n')
end_pos_line += len(lines) - 1 end_pos_line += len(lines) - 1
end_pos_col = self.start_pos_col end_pos_col = self.start_pos_col
# Check for multiline token # Check for multiline token
if self.start_pos_line == end_pos_line: if self.start_pos_line == end_pos_line:
end_pos_col += len(lines[-1]) end_pos_col += len(lines[-1])
else: else:
end_pos_col = len(lines[-1]) end_pos_col = len(lines[-1])
return (end_pos_line, end_pos_col) return (end_pos_line, end_pos_col)
# Make cache footprint smaller for faster unpickling # Make cache footprint smaller for faster unpickling
@@ -129,13 +127,15 @@ class Token(object):
) )
def __setstate__(self, state): def __setstate__(self, state):
self._token_type = state[0] self._token_type = state[0]
self._token = state[1] self._token = state[1]
self._start_pos_line = state[2] self._start_pos_line = state[2]
self._start_pos_col = state[3] self._start_pos_col = state[3]
class TokenNoCompat(Token): class TokenNoCompat(Token):
__slots__ = ()
def __unicode__(self): def __unicode__(self):
raise NotImplementedError("Compatibility only for basic token.") raise NotImplementedError("Compatibility only for basic token.")
@@ -151,6 +151,8 @@ class TokenDocstring(TokenNoCompat):
as_string() will clean the token representing the docstring. as_string() will clean the token representing the docstring.
""" """
__slots__ = ()
def __init__(self, token=None, state=None): def __init__(self, token=None, state=None):
if token: if token:
self.__setstate__(token.__getstate__()) self.__setstate__(token.__getstate__())

5
scripts/wx_check.py
View File

@@ -14,7 +14,10 @@ http://svn.wxwidgets.org/viewvc/wx/wxPython/trunk/src/gtk/_core.py?view=markup
import resource import resource
import time import time
import sys import sys
import urllib2 try:
import urllib.request as urllib2
except ImportError:
import urllib2
import gc import gc
from os.path import abspath, dirname from os.path import abspath, dirname