Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.6.6'

  • Loading branch information...
commit 127fcd5564ac833417b474d0eb077897c6f3b00b 2 parents c618656 + 01ea184
@klen authored
View
2  Changelog.rst
@@ -1,7 +1,7 @@
Changelog
=========
-## 2012-08-02 0.6.5
+## 2012-08-02 0.6.6
-------------------
* Updated Pep8 to version 1.3.3
* Updated Pylint to version 0.25.2
View
2  doc/pymode.txt
@@ -6,7 +6,7 @@
(__) (__) (__) (_) (_)(_____)(_)\_) (_/\/\_)(_____)(____/(____) ~
- Version: 0.6.4
+ Version: 0.6.6
==============================================================================
CONTENTS *Python-mode-contents*
View
4 plugin/pymode.vim
@@ -1,4 +1,4 @@
-let g:pymode_version = "0.6.5"
+let g:pymode_version = "0.6.6"
com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
@@ -46,7 +46,7 @@ curpath = vim.eval("getcwd()")
libpath = os.path.join(os.path.dirname(os.path.dirname(
vim.eval("expand('<sfile>:p')"))), 'pylibs')
-sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
+sys.path = [os.path.dirname(libpath), libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
EOF
endif
View
0  pylibs/__init__.py
No changes.
View
2  pylibs/pyflakes/checker.py
@@ -6,7 +6,7 @@
import os.path
import _ast
-from pyflakes import messages
+from . import messages
# utility function to iterate over an AST node's children, adapted
View
2  pylibs/pymode/auto.py
@@ -1,5 +1,5 @@
import vim
-from autopep8 import fix_file, PEP8_PASSES_MAX
+from pylibs.autopep8 import fix_file, PEP8_PASSES_MAX
class Options():
View
10 pylibs/pymode/lint.py
@@ -76,7 +76,7 @@ def parse_result(result):
def mccabe(filename):
- import mccabe as mc
+ from pylibs.mccabe import get_code_complexity
complexity = int(get_option('lint_mccabe_complexity'))
return mc.get_module_complexity(filename, min=complexity)
@@ -89,7 +89,7 @@ def pep8(filename):
def pylint(filename):
- from logilab.astng.builder import MANAGER
+ from pylibs.logilab.astng.builder import MANAGER
PYLINT or _init_pylint()
linter = PYLINT['lint']
@@ -102,7 +102,7 @@ def pylint(filename):
def pyflakes(filename):
- from pyflakes import checker
+ from pylibs.pyflakes import checker
import _ast
codeString = file(filename, 'U').read() + '\n'
@@ -125,7 +125,7 @@ def pyflakes(filename):
def _init_pylint():
- from pylint import lint, checkers, reporters
+ from pylibs.pylint import lint, checkers, reporters
import re
class VimReporter(reporters.BaseReporter):
@@ -160,7 +160,7 @@ def add_message(self, msg_id, location, msg):
def _init_pep8():
- import pep8 as p8
+ from pylibs import pep8 as p8
class _PEP8Report(p8.BaseReport):
View
38 pylibs/ropevim.py
@@ -3,14 +3,14 @@
import tempfile
import re
-import ropemode.decorators
-import ropemode.environment
-import ropemode.interface
+from pylibs.ropemode import decorators
+from pylibs.ropemode import environment
+from pylibs.ropemode import interface
import vim
-class VimUtils(ropemode.environment.Environment):
+class VimUtils(environment.Environment):
def __init__(self, *args, **kwargs):
super(VimUtils, self).__init__(*args, **kwargs)
@@ -62,10 +62,10 @@ def _update_proposals(self, values):
if not self.get('extended_complete'):
return u','.join(u"'%s'" % self._completion_text(proposal)
- for proposal in values)
+ for proposal in values)
return u','.join(self._extended_completion(proposal)
- for proposal in values)
+ for proposal in values)
def _command(self, command, encode=False):
if encode:
@@ -79,7 +79,7 @@ def ask_completion(self, prompt, values, starting=None):
if starting:
col -= len(starting)
self._command(u'call complete(%s, [%s])' % (col, proposals),
- encode=True)
+ encode=True)
return None
return self.ask_values(prompt, values, starting=starting,
@@ -118,8 +118,8 @@ def _decode_line(self, line):
return line.decode(self._get_encoding())
def _position_to_offset(self, lineno, colno):
- result = min(colno, len(self.buffer[lineno -1]) + 1)
- for line in self.buffer[:lineno-1]:
+ result = min(colno, len(self.buffer[lineno - 1]) + 1)
+ for line in self.buffer[:lineno - 1]:
line = self._decode_line(line)
result += len(line) + 1
return result
@@ -303,15 +303,17 @@ def _completion_data(self, proposal):
return proposal
_docstring_re = re.compile('^[\s\t\n]*([^\n]*)')
+
def _extended_completion(self, proposal):
# we are using extended complete and return dicts instead of strings.
# `ci` means "completion item". see `:help complete-items`
word, _, menu = map(lambda x: x.strip(), proposal.name.partition(':'))
ci = dict(
- word=word,
- info='',
- kind=''.join(s if s not in 'aeyuo' else '' for s in proposal.type)[:3],
- menu=menu or '')
+ word=word,
+ info='',
+ kind=''.join(
+ s if s not in 'aeyuo' else '' for s in proposal.type)[:3],
+ menu=menu or '')
if proposal.scope == 'parameter_keyword':
default = proposal.get_default()
@@ -388,18 +390,18 @@ def __call__(self, arg_lead, cmd_line, cursor_pos):
# don't know if self.values can be empty but better safe then sorry
if self.values:
if not isinstance(self.values[0], basestring):
- result = [proposal.name for proposal in self.values \
+ result = [proposal.name for proposal in self.values
if proposal.name.startswith(arg_lead)]
else:
- result = [proposal for proposal in self.values \
+ result = [proposal for proposal in self.values
if proposal.startswith(arg_lead)]
vim.command('let s:completions = %s' % result)
-ropemode.decorators.logger.message = echo
-ropemode.decorators.logger.only_short = True
+decorators.logger.message = echo
+decorators.logger.only_short = True
_completer = _ValueCompleter()
_env = VimUtils()
-_interface = ropemode.interface.RopeMode(env=_env)
+_interface = interface.RopeMode(env=_env)
Please sign in to comment.
Something went wrong with that request. Please try again.