Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit127fcd5

Browse files
committed
Merge branch 'release/0.6.6'
2 parentsc618656 +01ea184 commit127fcd5

File tree

8 files changed

+31
-29
lines changed

8 files changed

+31
-29
lines changed

‎Changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Changelog
22
=========
33

4-
## 2012-08-02 0.6.5
4+
## 2012-08-02 0.6.6
55
-------------------
66
* Updated Pep8 to version 1.3.3
77
* Updated Pylint to version 0.25.2

‎doc/pymode.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(__) (__) (__) (_) (_)(_____)(_)\_) (_/\/\_)(_____)(____/(____)~
77

88

9-
Version: 0.6.4
9+
Version: 0.6.6
1010

1111
==============================================================================
1212
CONTENTS*Python-mode-contents*

‎plugin/pymode.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
letg:pymode_version="0.6.5"
1+
letg:pymode_version="0.6.6"
22

33
com! PymodeVersionechomsg"Current python-mode version:" .g:pymode_version
44

@@ -46,7 +46,7 @@ curpath = vim.eval("getcwd()")
4646
libpath= os.path.join(os.path.dirname(os.path.dirname(
4747
vim.eval("expand('<sfile>:p')"))),'pylibs')
4848

49-
sys.path= [libpath, curpath]+vim.eval("g:pymode_paths")+ sys.path
49+
sys.path= [os.path.dirname(libpath),libpath, curpath]+vim.eval("g:pymode_paths")+ sys.path
5050
EOF
5151

5252
endif

‎pylibs/__init__.py

Whitespace-only changes.

‎pylibs/pyflakes/checker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
importos.path
77
import_ast
88

9-
frompyflakesimportmessages
9+
from.importmessages
1010

1111

1212
# utility function to iterate over an AST node's children, adapted

‎pylibs/pymode/auto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importvim
2-
fromautopep8importfix_file,PEP8_PASSES_MAX
2+
frompylibs.autopep8importfix_file,PEP8_PASSES_MAX
33

44

55
classOptions():

‎pylibs/pymode/lint.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def parse_result(result):
7676

7777

7878
defmccabe(filename):
79-
importmccabeasmc
79+
frompylibs.mccabeimportget_code_complexity
8080

8181
complexity=int(get_option('lint_mccabe_complexity'))
8282
returnmc.get_module_complexity(filename,min=complexity)
@@ -89,7 +89,7 @@ def pep8(filename):
8989

9090

9191
defpylint(filename):
92-
fromlogilab.astng.builderimportMANAGER
92+
frompylibs.logilab.astng.builderimportMANAGER
9393

9494
PYLINTor_init_pylint()
9595
linter=PYLINT['lint']
@@ -102,7 +102,7 @@ def pylint(filename):
102102

103103

104104
defpyflakes(filename):
105-
frompyflakesimportchecker
105+
frompylibs.pyflakesimportchecker
106106
import_ast
107107

108108
codeString=file(filename,'U').read()+'\n'
@@ -125,7 +125,7 @@ def pyflakes(filename):
125125

126126
def_init_pylint():
127127

128-
frompylintimportlint,checkers,reporters
128+
frompylibs.pylintimportlint,checkers,reporters
129129
importre
130130

131131
classVimReporter(reporters.BaseReporter):
@@ -160,7 +160,7 @@ def add_message(self, msg_id, location, msg):
160160

161161
def_init_pep8():
162162

163-
importpep8asp8
163+
frompylibsimportpep8asp8
164164

165165
class_PEP8Report(p8.BaseReport):
166166

‎pylibs/ropevim.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
importtempfile
44
importre
55

6-
importropemode.decorators
7-
importropemode.environment
8-
importropemode.interface
6+
frompylibs.ropemodeimportdecorators
7+
frompylibs.ropemodeimportenvironment
8+
frompylibs.ropemodeimportinterface
99

1010
importvim
1111

1212

13-
classVimUtils(ropemode.environment.Environment):
13+
classVimUtils(environment.Environment):
1414

1515
def__init__(self,*args,**kwargs):
1616
super(VimUtils,self).__init__(*args,**kwargs)
@@ -62,10 +62,10 @@ def _update_proposals(self, values):
6262

6363
ifnotself.get('extended_complete'):
6464
returnu','.join(u"'%s'"%self._completion_text(proposal)
65-
forproposalinvalues)
65+
forproposalinvalues)
6666

6767
returnu','.join(self._extended_completion(proposal)
68-
forproposalinvalues)
68+
forproposalinvalues)
6969

7070
def_command(self,command,encode=False):
7171
ifencode:
@@ -79,7 +79,7 @@ def ask_completion(self, prompt, values, starting=None):
7979
ifstarting:
8080
col-=len(starting)
8181
self._command(u'call complete(%s, [%s])'% (col,proposals),
82-
encode=True)
82+
encode=True)
8383
returnNone
8484

8585
returnself.ask_values(prompt,values,starting=starting,
@@ -118,8 +118,8 @@ def _decode_line(self, line):
118118
returnline.decode(self._get_encoding())
119119

120120
def_position_to_offset(self,lineno,colno):
121-
result=min(colno,len(self.buffer[lineno-1])+1)
122-
forlineinself.buffer[:lineno-1]:
121+
result=min(colno,len(self.buffer[lineno-1])+1)
122+
forlineinself.buffer[:lineno-1]:
123123
line=self._decode_line(line)
124124
result+=len(line)+1
125125
returnresult
@@ -303,15 +303,17 @@ def _completion_data(self, proposal):
303303
returnproposal
304304

305305
_docstring_re=re.compile('^[\s\t\n]*([^\n]*)')
306+
306307
def_extended_completion(self,proposal):
307308
# we are using extended complete and return dicts instead of strings.
308309
# `ci` means "completion item". see `:help complete-items`
309310
word,_,menu=map(lambdax:x.strip(),proposal.name.partition(':'))
310311
ci=dict(
311-
word=word,
312-
info='',
313-
kind=''.join(sifsnotin'aeyuo'else''forsinproposal.type)[:3],
314-
menu=menuor'')
312+
word=word,
313+
info='',
314+
kind=''.join(
315+
sifsnotin'aeyuo'else''forsinproposal.type)[:3],
316+
menu=menuor'')
315317

316318
ifproposal.scope=='parameter_keyword':
317319
default=proposal.get_default()
@@ -388,18 +390,18 @@ def __call__(self, arg_lead, cmd_line, cursor_pos):
388390
# don't know if self.values can be empty but better safe then sorry
389391
ifself.values:
390392
ifnotisinstance(self.values[0],basestring):
391-
result= [proposal.nameforproposalinself.values \
393+
result= [proposal.nameforproposalinself.values
392394
ifproposal.name.startswith(arg_lead)]
393395
else:
394-
result= [proposalforproposalinself.values \
396+
result= [proposalforproposalinself.values
395397
ifproposal.startswith(arg_lead)]
396398
vim.command('let s:completions = %s'%result)
397399

398400

399-
ropemode.decorators.logger.message=echo
400-
ropemode.decorators.logger.only_short=True
401+
decorators.logger.message=echo
402+
decorators.logger.only_short=True
401403

402404
_completer=_ValueCompleter()
403405

404406
_env=VimUtils()
405-
_interface=ropemode.interface.RopeMode(env=_env)
407+
_interface=interface.RopeMode(env=_env)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp