Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94599
Change subject: Code improvements
......................................................................
Code improvements
- remove obsolete threading
- call getVersionHistory() as method not as function
because we do not need the result here and use the internal
variable "_revisions"
- simplify result for isEmpty()
- change "return None" to "return" which returns None per default
- PEP8 changes
Change-Id: I8eb71790f3c762feee1ff7d86fa91eed3be72b32
---
M pywikibot/page.py
1 file changed, 24 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/99/94599/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index ca159fd..0d935ad 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -19,7 +19,6 @@
import htmlentitydefs
import logging
import re
-import threading
import unicodedata
import urllib
import collections
@@ -141,11 +140,11 @@
title = title + "#" + self._link.section
if asLink:
if forceInterwiki or \
- (allowInterwiki and \
- (self.site.family.name != config.family
- or self.site.code != config.mylang)):
+ (allowInterwiki and
+ (self.site.family.name != config.family
+ or self.site.code != config.mylang)):
if self.site.family.name != config.family \
- and self.site.family.name != self.site.code:
+ and self.site.family.name != self.site.code:
return u'[[%s:%s:%s]]' % (self.site.family.name,
self.site.code,
title)
@@ -429,7 +428,7 @@
def previousRevision(self):
"""Return the revision id for the previous revision of this Page."""
- vh = self.getVersionHistory(total=2)
+ self.getVersionHistory(total=2)
revkey = sorted(self._revisions, reverse=True)[1]
return revkey
@@ -473,7 +472,8 @@
if template.title(withNamespace=False) in catredirs:
# Get target (first template argument)
try:
- self._catredirect = self.site.namespace(14) + ":" +
args[0].strip()
+ self._catredirect = "%s:%s" % (self.site.namespace(14),
+ args[0].strip())
break
except IndexError:
pywikibot.warning(
@@ -501,10 +501,7 @@
txt = self.get()
txt = pywikibot.removeLanguageLinks(txt, site=self.site)
txt = pywikibot.removeCategoryLinks(txt, site=self.site)
- if len(txt) < 4:
- return True
- else:
- return False
+ return len(txt) < 4
def isTalkPage(self):
"""Return True if this page is in any talk namespace."""
@@ -523,7 +520,7 @@
"""
ns = self.namespace()
if ns < 0: # Special page
- return None
+ return
if self.isTalkPage():
if self.namespace() == 1:
return Page(self.site, self.title(withNamespace=False))
@@ -854,15 +851,15 @@
family = self.site.family.name
config.cosmetic_changes_disable.update({'wikidata': ('repo', )})
if config.cosmetic_changes_mylang_only:
- cc = (family == config.family and \
- self.site.lang == config.mylang) or \
- family in config.cosmetic_changes_enable.keys() and \
- self.site.lang in config.cosmetic_changes_enable[family]
+ cc = ((family == config.family and
+ self.site.lang == config.mylang) or
+ family in config.cosmetic_changes_enable.keys() and
+ self.site.lang in config.cosmetic_changes_enable[family])
else:
cc = True
- cc = cc and not \
- (family in config.cosmetic_changes_disable.keys() and \
- self.site.lang in config.cosmetic_changes_disable[family])
+ cc = (cc and not
+ (family in config.cosmetic_changes_disable.keys() and
+ self.site.lang in config.cosmetic_changes_disable[family]))
if not cc:
return
old = self.text
@@ -876,7 +873,8 @@
pageTitle=self.title())
self.text = ccToolkit.change(old)
if comment and \
- old.strip().replace('\r\n', '\n') !=
self.text.strip().replace('\r\n', '\n'):
+ old.strip().replace('\r\n',
+ '\n') != self.text.strip().replace('\r\n',
'\n'):
comment += i18n.twtranslate(self.site, 'cosmetic_changes-append')
return comment
@@ -1342,8 +1340,8 @@
if not hasattr(self, "_deletedRevs"):
self.loadDeletedRevisions()
if timestamp not in self._deletedRevs:
- #TODO: Throw an exception?
- return None
+ # TODO: Throw an exception?
+ return
self._deletedRevs[timestamp][4] = undelete
self._deletedRevsModified = True
@@ -1496,11 +1494,11 @@
"""
if not self.isCategory():
- return None # should this raise an exception??
+ return # should this raise an exception??
try:
return self.site.categoryinfo(self)
except NotImplementedError:
- return None
+ return
######## DEPRECATED METHODS ########
@@ -2258,7 +2256,7 @@
for contrib in self.site.usercontribs(
user=self.username, namespaces=namespaces, total=total):
ts = pywikibot.Timestamp.fromISOformat(contrib['timestamp'])
- yield (Page(self.site, contrib['title'], contrib['ns']), \
+ yield (Page(self.site, contrib['title'], contrib['ns']),
contrib['revid'],
ts,
contrib.get('comment', None)
@@ -2278,7 +2276,7 @@
raise StopIteration
for item in self.site.logevents(
logtype='upload', user=self.username, total=total):
- yield (ImagePage(self.site, item.title().title()), \
+ yield (ImagePage(self.site, item.title().title()),
unicode(item.timestamp()),
item.comment(),
item.pageid() > 0
--
To view, visit https://gerrit.wikimedia.org/r/94599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb71790f3c762feee1ff7d86fa91eed3be72b32
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
