jenkins-bot has submitted this change and it was merged.
Change subject: pep8-ified editor.py
......................................................................
pep8-ified editor.py
Change-Id: I012471704402ad1b6efe9fced20530eee660bb1f
---
M pywikibot/editor.py
1 file changed, 14 insertions(+), 13 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/editor.py b/pywikibot/editor.py
index 5fa57dc..871c4a7 100644
--- a/pywikibot/editor.py
+++ b/pywikibot/editor.py
@@ -25,7 +25,7 @@
def __init__(self):
pass
- def command(self, tempFilename, text, jumpIndex = None):
+ def command(self, tempFilename, text, jumpIndex=None):
command = config.editor
if jumpIndex:
# Some editors make it possible to mark occurences of substrings,
@@ -41,25 +41,25 @@
if config.editor.startswith('kate'):
command += " -l %i -c %i" % (line + 1, column + 1)
elif config.editor.startswith('gedit'):
- command += " +%i" % (line + 1) # seems not to support columns
+ command += " +%i" % (line + 1) # seems not to support columns
elif config.editor.startswith('emacs'):
- command += " +%i" % (line + 1) # seems not to support columns
+ command += " +%i" % (line + 1) # seems not to support columns
elif config.editor.startswith('jedit'):
- command += " +line:%i" % (line + 1) # seems not to support columns
+ command += " +line:%i" % (line + 1) # seems not to support columns
elif config.editor.startswith('vim'):
- command += " +%i" % (line + 1) # seems not to support columns
+ command += " +%i" % (line + 1) # seems not to support columns
elif config.editor.startswith('nano'):
command += " +%i,%i" % (line + 1, column + 1)
# Windows editors
elif config.editor.lower().endswith('notepad++.exe'):
- command += " -n%i" % (line + 1) # seems not to support columns
+ command += " -n%i" % (line + 1) # seems not to support columns
command += ' %s' % tempFilename
#print command
return command
def convertLinebreaks(self, text):
- if sys.platform=='win32':
+ if sys.platform == 'win32':
return text.replace('\r\n', '\n')
# TODO: Mac OS handling
return text
@@ -67,12 +67,12 @@
def restoreLinebreaks(self, text):
if text is None:
return None
- if sys.platform=='win32':
+ if sys.platform == 'win32':
return text.replace('\n', '\r\n')
# TODO: Mac OS handling
return text
- def edit(self, text, jumpIndex = None, highlight = None):
+ def edit(self, text, jumpIndex=None, highlight=None):
"""
Calls the editor and thus allows the user to change the text.
Returns the modified text. Halts the thread's operation until the
editor
@@ -100,11 +100,12 @@
# Nothing changed
return None
else:
- newcontent = open(tempFilename).read().decode(
- config.editor_encoding)
+ newcontent =
open(tempFilename).read().decode(config.editor_encoding)
os.unlink(tempFilename)
return self.restoreLinebreaks(newcontent)
else:
return self.restoreLinebreaks(
- pywikibot.editText(text, jumpIndex=jumpIndex,
- highlight=highlight))
+ pywikibot.editText(
+ text,
+ jumpIndex=jumpIndex,
+ highlight=highlight))
--
To view, visit https://gerrit.wikimedia.org/r/79589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I012471704402ad1b6efe9fced20530eee660bb1f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
