Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13280 discussions

[Gerrit] Add an ItemPage.iterlinks function to yield sitelinks - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add an ItemPage.iterlinks function to yield sitelinks ...................................................................... Add an ItemPage.iterlinks function to yield sitelinks Change-Id: I43ab820a5d97a22619dc5753d98bdd4ceec277f7 --- M pywikibot/page.py 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 72540eb..81daf92 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2540,6 +2540,23 @@ 'claims': self.claims } + def iterlinks(self, family=None): + """ + Iterates through all the sitelinks + @param family: string/Family object which represents what family of + links to iterate + @type family: str|pywikibot.family.Family + @return: iterator of pywikibot.Page objects + """ + if not hasattr(self, 'sitelinks'): + self.get() + if not isinstance(family, pywikibot.family.Family): + family = pywikibot.site.Family(family) + for dbname in self.sitelinks: + pg = Page(pywikibot.site.APISite.fromDBName(dbname), self.sitelinks[dbname]) + if not family or family == pg.site.family: + yield pg + def getSitelink(self, site, force=False): """ Returns the title (unicode string) for the specific site -- To view, visit https://gerrit.wikimedia.org/r/79554 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43ab820a5d97a22619dc5753d98bdd4ceec277f7 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] ask for permission to run patch command warning that several... - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: ask for permission to run patch command warning that several scripts might fail, if modules are not installed as needed ...................................................................... ask for permission to run patch command warning that several scripts might fail, if modules are not installed as needed Change-Id: Ieaea7b24bee1f569577a1c9ce9dfc9c6f84f4ef4 --- M externals/__init__.py 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index 83045f5..c58c375 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -162,6 +162,8 @@ 'pydmtx', 'py_w3c', '_zbar', ] # OPEN: 'opencv', 'slic', '_bob', 'xbob_flandmark', +_patch_permission = None + import os import sys @@ -206,6 +208,15 @@ " (y/N)") v = raw_input().upper() return v == 'Y' or v == 'YES' + +def show_patch_question(): + globals _patch_permission + if _patch_permission is None: + lowlevel_warning("Give externals permission to execute the patch command?" + " (y/N)") + v = raw_input().upper() + _patch_permission = (v == 'Y') or (v == 'YES') + return _patch_permission def python_module_exists(module_name): @@ -335,7 +346,7 @@ shutil.rmtree(os.path.join(path, '__setup_tmp/')) result = 0 - if 'patch' in package: + if ('patch' in package) and show_patch_question(): lowlevel_warning(u'Install package "%s" by applying patch to %s.' % (module, os.path.join(path, module))) if sys.platform == 'win32': @@ -389,6 +400,12 @@ return lowlevel_warning(u'Package "%s" could not be found nor installed!' % m) + lowlevel_warning(u'Several scripts might fail, if some modules are not' + u' installed as needed! You can either install them' + u' by yourself to the system or extract them into the' + u' externals/ directory. If you chose to not install them' + u' this script will ask you again next time whether you' + u' whish to install the external code.') def check_setup_all(): -- To view, visit https://gerrit.wikimedia.org/r/77341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieaea7b24bee1f569577a1c9ce9dfc9c6f84f4ef4 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] adopt version handling and output to transition from SVN to ... - change (pywikibot/compat)

by DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged. Change subject: adopt version handling and output to transition from SVN to GIT pywikibot/version.py sync-ed with core again ...................................................................... adopt version handling and output to transition from SVN to GIT pywikibot/version.py sync-ed with core again Change-Id: I79efeff22636db7fb1a9258ab6e95615afb8aad6 --- M pwb.py M pywikibot/version.py M wikipedia.py 3 files changed, 83 insertions(+), 41 deletions(-) Approvals: DrTrigon: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 8388ca3..f3e538a 100755 --- a/pwb.py +++ b/pwb.py @@ -149,12 +149,11 @@ error = u'' try: - __release_ver = str(version.getversion_svn(pywikibot.config.datafilepath('..'))[1]) - #__release_ver = version.getversion().strip() + __release = version.getversiondict() d = shelve.open(pywikibot.config.datafilepath('cache', 'state_bots')) - d['bot_control'] = { 'release_ver': __release_ver, - 'framework_ver': __release_ver, - 'online_ver': version.getversion_onlinerepo(), + d['bot_control'] = {'release_rev': str(__release['rev']), + 'release_ver': __release['hsh'][:7], + 'online_ver': version.getversion_onlinerepo()[:7], } pywikibot.output(d['bot_control']) pywikibot.output(u'=== ' * 14) diff --git a/pywikibot/version.py b/pywikibot/version.py index 571ebe4..a9c6344 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -11,13 +11,16 @@ import os import sys -import time +import time, datetime import urllib +import subprocess cache = None + class ParseError(Exception): """ Parsing went wrong """ + def _get_program_dir(): _program_dir = os.path.normpath(os.path.split(os.path.dirname(__file__))[0]) @@ -26,44 +29,52 @@ ## _program_dir = os.path.normpath(os.path.join(os.getcwd(), _program_dir)) return _program_dir + def getversion(): - data = getversiondict() + data = dict(getversiondict()) # copy dict to prevent changes in 'chache' try: - rev2 = int(getversion_onlinerepo()) - rev1 = int(str(data['rev']).split()[0]) - data['cmp_ver'] = 'OUTDATED' if rev1 < rev2 else 'ok' + hsh2 = getversion_onlinerepo() + hsh1 = data['hsh'] + data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' except Exception: data['cmp_ver'] = 'n/a' - return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data + data['hsh'] = data['hsh'][:7] # make short hash from full hash + return '%(tag)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)' % data def getversiondict(): global cache if cache: - return cache + return cache try: - (tag, rev, date) = getversion_svn() + (tag, rev, date, hsh) = getversion_git() except Exception: try: - (tag, rev, date) = getversion_nightly() + (tag, rev, date, hsh) = getversion_nightly() except Exception: try: version = getfileversion('wikipedia.py') if not version: # fall-back in case everything breaks (should not be used) import wikipedia - version = wikipedia.__version__ + version = getfileversion(wikipedia.__file__[:-1]) - id, file, rev, date, ts, author, dollar = version.split(' ') + file, hsh_short, date, ts = version.split(' ') tag = 'wikipedia.py' - date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%SZ') - except: # nothing worked; version unknown (but suppress exceptions) + rev = '-1 (unknown)' + ts = ts.split('.')[0] + date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%S') + hsh = hsh_short + ('?' * 33) # enhance the short hash w. '?' + except: + # nothing worked; version unknown (but suppress exceptions) # the value is most likely '$Id' + '$', it means that # wikipedia.py got imported without using svn at all - return dict(tag='', rev='-1 (unknown)', date='0 (unknown)') + return dict(tag='', rev='-1 (unknown)', date='0 (unknown)', + hsh='(unknown)') datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) - cache = dict(tag=tag, rev=rev, date=datestring) + cache = dict(tag=tag, rev=rev, date=datestring, hsh=hsh) return cache + def getversion_svn(path=None): _program_dir = path or _get_program_dir() @@ -75,7 +86,7 @@ from sqlite3 import dbapi2 as sqlite con = sqlite.connect(os.path.join(_program_dir, ".svn/wc.db")) cur = con.cursor() - cur.execute( '''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') + cur.execute('''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') name, tag, rev, date = cur.fetchone() con.close() tag = tag[:-len(name)] @@ -89,58 +100,90 @@ tag = '[%s] %s' % (t[0], t[1]) for i in xrange(4): entries.readline() - date = time.strptime(entries.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = entries.readline()[:-1] entries.close() if (not date or not tag or not rev) and not path: raise ParseError return (tag, rev, date) +def getversion_git(path=None): + _program_dir = path or _get_program_dir() + #(try to use .git directory for new entries format) + #tag = subprocess.Popen('git config --get remote.origin.url', + # shell=True, + # stdout=subprocess.PIPE).stdout.read() + tag = open(os.path.join(_program_dir, '.git/config'), 'r').read() + s = tag.find('url = ', tag.find('[remote "origin"]')) + e = tag.find('\n', s) + tag = tag[(s+6):e] + t = tag.strip().split('/') + tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) + info = subprocess.Popen("git log --pretty=format:'%ad|%an|%h|%H|%d' --abbrev-commit --date=iso -1 | cat -", + shell=True, + stdout=subprocess.PIPE).stdout.read() + info = info.split('|') + date = info[0][:-6] + date = time.strptime(date, '%Y-%m-%d %H:%M:%S') + rev = subprocess.Popen('git rev-list HEAD | wc -l', + shell=True, + stdout=subprocess.PIPE).stdout.read() + rev = int(rev.strip()) + hsh = info[3] # also stored in '.git/refs/heads/master' + if (not date or not tag or not rev) and not path: + raise ParseError + return (tag, rev, date, hsh) + def getversion_nightly(): data = open(os.path.join(wikipediatools.get_base_dir(), 'version')) tag = data.readline().strip() - date = time.strptime(data.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(data.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = data.readline().strip() if not date or not tag or not rev: raise ParseError - return (tag, rev, date) + return (tag, rev, date, '(unknown)') -## Retrieve revision number of framework online repository's svnroot -# def getversion_onlinerepo(repo=None): - url = repo or 'http://svn.wikimedia.org/svnroot/pywikipedia/trunk/pywikipedia/' - rev = None + """ Retrieve revision number of framework online repository's svnroot """ + url = repo or 'https://git.wikimedia.org/feed/pywikibot/compat' + hsh = None try: - buf = urllib.urlopen(url).read() - rev = buf.split(' ')[3][:-1] + buf = urllib.urlopen(url).readlines() + hsh = buf[13].split('/')[5][:-1] except: raise ParseError - return rev + return hsh ## Simple version comparison # cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a-b)//tol, 0)] -## Retrieve revision number of file (__version__ variable containing Id tag) -# without importing it (thus can be done for any file) -# + def getfileversion(filename): + """ Retrieve revision number of file (__version__ variable containing Id tag) + without importing it (thus can be done for any file) + """ _program_dir = _get_program_dir() __version__ = None + size, mtime = None, None fn = os.path.join(_program_dir, filename) if os.path.exists(fn): for line in open(fn, 'r').readlines(): if line.find('__version__') == 0: exec(line) break - return __version__ + stat = os.stat(fn) + mtime = datetime.datetime.fromtimestamp(stat.st_mtime).isoformat(' ') + if mtime and __version__: + return u'%s %s %s' % (filename, __version__[5:-1][:7], mtime) + else: + return None -## Get the tail path component and file name of the currently executing -# script. Returns a tuple. -# + def get_executing_script(): - """Get the last path component and filename of the currently - executing script.""" + """ Get the last path component (tail) and filename of the currently + executing script. Returns a tuple. + """ try: script = os.path.abspath(sys.modules['__main__'].__file__) except (KeyError, AttributeError): diff --git a/wikipedia.py b/wikipedia.py index ccdc5d7..028987a 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -9231,7 +9231,7 @@ output(u'MODULES:') for item in sys.modules.keys(): ver = version.getfileversion('%s.py' % item.replace('.', '/')) - if ver and (ver[0] == u'$'): + if ver: output(u' %s' % ver) # messages on bot discussion page? -- To view, visit https://gerrit.wikimedia.org/r/77497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79efeff22636db7fb1a9258ab6e95615afb8aad6 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] adopt version handling and output to transition from SVN to ... - change (pywikibot/core)

by DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged. Change subject: adopt version handling and output to transition from SVN to GIT (from compat) pywikibot/version.py sync-ed with compat again ...................................................................... adopt version handling and output to transition from SVN to GIT (from compat) pywikibot/version.py sync-ed with compat again Change-Id: I54977388743f6b135ad296a3e3a46e1e519e81b2 --- M pywikibot/bot.py M pywikibot/version.py 2 files changed, 59 insertions(+), 23 deletions(-) Approvals: DrTrigon: Verified; Looks good to me, approved Merlijn van Deen: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 3e7aa5b..fa7ee43 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -265,7 +265,7 @@ log(u'MODULES:') for item in sys.modules.keys(): ver = version.getfileversion('%s.py' % item.replace('.', '/')) - if ver and (ver[0] == u'$'): + if ver: log(u' %s' % ver) # messages on bot discussion page? diff --git a/pywikibot/version.py b/pywikibot/version.py index 9d23b12..8d6de3f 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -10,8 +10,9 @@ __version__ = '$Id$' import os -import time +import time, datetime import urllib +import subprocess cache = None @@ -29,44 +30,48 @@ def getversion(): - data = getversiondict() + data = dict(getversiondict()) # copy dict to prevent changes in 'chache' try: - rev2 = int(getversion_onlinerepo()) - rev1 = int(str(data['rev']).split()[0]) - data['cmp_ver'] = 'OUTDATED' if rev1 < rev2 else 'ok' + hsh2 = getversion_onlinerepo() + hsh1 = data['hsh'] + data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' except Exception: data['cmp_ver'] = 'n/a' - return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data - + data['hsh'] = data['hsh'][:7] # make short hash from full hash + return '%(tag)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)' % data def getversiondict(): global cache if cache: return cache try: - (tag, rev, date) = getversion_svn() + (tag, rev, date, hsh) = getversion_git() except Exception: try: - (tag, rev, date) = getversion_nightly() + (tag, rev, date, hsh) = getversion_nightly() except Exception: try: version = getfileversion('pywikibot/__init__.py') if not version: # fall-back in case everything breaks (should not be used) import pywikibot - version = pywikibot.__version__ + version = getfileversion(pywikibot.__file__[:-1]) - id, file, rev, date, ts, author, dollar = version.split(' ') + file, hsh_short, date, ts = version.split(' ') tag = 'pywikibot/__init__.py' - date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%SZ') + rev = '-1 (unknown)' + ts = ts.split('.')[0] + date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%S') + hsh = hsh_short + ('?' * 33) # enhance the short hash w. '?' except: # nothing worked; version unknown (but suppress exceptions) # the value is most likely '$Id' + '$', it means that # wikipedia.py got imported without using svn at all - return dict(tag='', rev='-1 (unknown)', date='0 (unknown)') + return dict(tag='', rev='-1 (unknown)', date='0 (unknown)', + hsh='(unknown)') datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) - cache = dict(tag=tag, rev=rev, date=datestring) + cache = dict(tag=tag, rev=rev, date=datestring, hsh=hsh) return cache @@ -101,6 +106,32 @@ raise ParseError return (tag, rev, date) +def getversion_git(path=None): + _program_dir = path or _get_program_dir() + #(try to use .git directory for new entries format) + #tag = subprocess.Popen('git config --get remote.origin.url', + # shell=True, + # stdout=subprocess.PIPE).stdout.read() + tag = open(os.path.join(_program_dir, '.git/config'), 'r').read() + s = tag.find('url = ', tag.find('[remote "origin"]')) + e = tag.find('\n', s) + tag = tag[(s+6):e] + t = tag.strip().split('/') + tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) + info = subprocess.Popen("git log --pretty=format:'%ad|%an|%h|%H|%d' --abbrev-commit --date=iso -1 | cat -", + shell=True, + stdout=subprocess.PIPE).stdout.read() + info = info.split('|') + date = info[0][:-6] + date = time.strptime(date, '%Y-%m-%d %H:%M:%S') + rev = subprocess.Popen('git rev-list HEAD | wc -l', + shell=True, + stdout=subprocess.PIPE).stdout.read() + rev = int(rev.strip()) + hsh = info[3] # also stored in '.git/refs/heads/master' + if (not date or not tag or not rev) and not path: + raise ParseError + return (tag, rev, date, hsh) def getversion_nightly(): data = open(os.path.join(wikipediatools.get_base_dir(), 'version')) @@ -109,19 +140,18 @@ rev = data.readline().strip() if not date or not tag or not rev: raise ParseError - return (tag, rev, date) - + return (tag, rev, date, '(unknown)') def getversion_onlinerepo(repo=None): """ Retrieve revision number of framework online repository's svnroot """ - url = repo or 'http://svn.wikimedia.org/svnroot/pywikipedia/trunk/pywikipedia/' - rev = None + url = repo or 'https://git.wikimedia.org/feed/pywikibot/core' + hsh = None try: - buf = urllib.urlopen(url).read() - rev = buf.split(' ')[3][:-1] + buf = urllib.urlopen(url).readlines() + hsh = buf[13].split('/')[5][:-1] except: raise ParseError - return rev + return hsh ## Simple version comparison # @@ -134,10 +164,16 @@ """ _program_dir = _get_program_dir() __version__ = None + size, mtime = None, None fn = os.path.join(_program_dir, filename) if os.path.exists(fn): for line in open(fn, 'r').readlines(): if line.find('__version__') == 0: exec(line) break - return __version__ + stat = os.stat(fn) + mtime = datetime.datetime.fromtimestamp(stat.st_mtime).isoformat(' ') + if mtime and __version__: + return u'%s %s %s' % (filename, __version__[5:-1][:7], mtime) + else: + return None -- To view, visit https://gerrit.wikimedia.org/r/77502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54977388743f6b135ad296a3e3a46e1e519e81b2 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] Revert "replace print statement with pywikibot.output()" wai... - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Revert "replace print statement with pywikibot.output()" waiting for new occurance ...................................................................... Revert "replace print statement with pywikibot.output()" waiting for new occurance This reverts commit aef8268011cd3696071b8894231406e43f2aa5c5, gerrit 78661 Change-Id: I9b18c252ffc57d5133a423cfa4205c03c6c89b88 --- M userlib.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/userlib.py b/userlib.py index 2a9d988..21e7c74 100644 --- a/userlib.py +++ b/userlib.py @@ -642,7 +642,7 @@ data = self.getData() except Exception, e: # Print the traceback of the caught exception - pywikibot.output(e) + print e raise else: break -- To view, visit https://gerrit.wikimedia.org/r/79454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b18c252ffc57d5133a423cfa4205c03c6c89b88 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8 fixes - change (pywikibot/compat)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8 fixes ...................................................................... pep8 fixes Change-Id: Ida8b6b45dc63c49cf1f1e494cf54f427f48e854a --- M wikipedia.py 1 file changed, 30 insertions(+), 26 deletions(-) Approvals: Xqt: Looks good to me, approved diff --git a/wikipedia.py b/wikipedia.py index ccdc5d7..ca870fc 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -1033,10 +1033,10 @@ # TODO: should this default to change_edit_time = False? If we're not # getting the current version, why change the timestamps? return self._getEditPage( - get_redirect=get_redirect, throttle=throttle, - sysop=sysop, oldid=oldid, - change_edit_time=change_edit_time - ) + get_redirect=get_redirect, throttle=throttle, + sysop=sysop, oldid=oldid, + change_edit_time=change_edit_time + ) ## @since r10309 # @remarks needed by various bots @@ -1125,13 +1125,14 @@ break except Error: pos = None - if (pos == None): + if pos is None: raise # re-raise # check min. level data = [] for item in r: - if (item[u'level'] < minLevel): continue + if item[u'level'] < minLevel: + continue data.append( item ) r = data @@ -1758,10 +1759,9 @@ else: allDone = True - def getReferencesOld(self, - follow_redirects=True, withTemplateInclusion=True, - onlyTemplateInclusion=False, redirectsOnly=False): + follow_redirects=True, withTemplateInclusion=True, + onlyTemplateInclusion=False, redirectsOnly=False): """Yield all pages that link to the page. """ # Temporary bug-fix while researching more robust solution: @@ -1770,11 +1770,11 @@ site = self.site() path = self.site().references_address(self.urlname()) if withTemplateInclusion: - path+=u'&hidetrans=0' + path += u'&hidetrans=0' if onlyTemplateInclusion: - path+=u'&hidetrans=0&hidelinks=1&hideredirs=1&hideimages=1' + path += u'&hidetrans=0&hidelinks=1&hideredirs=1&hideimages=1' if redirectsOnly: - path+=u'&hideredirs=0&hidetrans=1&hidelinks=1&hideimages=1' + path += u'&hideredirs=0&hidetrans=1&hidelinks=1&hideimages=1' content = SoupStrainer("div", id=self.site().family.content_id) try: next_msg = self.site().mediawiki_message('whatlinkshere-next') @@ -3718,10 +3718,10 @@ """ # Login - self._getActionUser(action = 'protect', sysop = True) + self._getActionUser(action='protect', sysop=True) # Check blocks - self.site().checkBlocks(sysop = True) + self.site().checkBlocks(sysop=True) #if self.exists() and editcreate != move: # check protect level if edit/move not same # if editcreate == 'sysop' and move != 'sysop': @@ -3734,8 +3734,7 @@ if throttle: put_throttle() if reason is None: - reason = input( - u'Please enter a reason for the change of the protection level:') + reason = input(u'Please enter a reason for the change of the protection level:') reason = reason.encode(self.site().encoding()) answer = 'y' if prompt and not hasattr(self.site(), '_noProtectPrompt'): @@ -3751,7 +3750,7 @@ editcreate_duration, move_duration, cascading, prompt, throttle) - token = self.site().getToken(self, sysop = True) + token = self.site().getToken(self, sysop=True) # Translate 'none' to '' protections = [] @@ -3811,22 +3810,26 @@ return False - def _oldProtect(self, editcreate = 'sysop', move = 'sysop', unprotect = False, reason = None, editcreate_duration = 'infinite', - move_duration = 'infinite', cascading = False, prompt = True, throttle = True): + def _oldProtect(self, editcreate='sysop', move='sysop', unprotect=False, reason=None, editcreate_duration='infinite', + move_duration='infinite', cascading=False, prompt=True, throttle=True): """internal use for protect page by ordinary web page form""" host = self.site().hostname() - token = self.site().getToken(sysop = True) + token = self.site().getToken(sysop=True) # Translate 'none' to '' - if editcreate == 'none': editcreate = '' - if move == 'none': move = '' + if editcreate == 'none': + editcreate = '' + if move == 'none': + move = '' # Translate no duration to infinite - if editcreate_duration == 'none' or not editcreate_duration: editcreate_duration = 'infinite' - if move_duration == 'none' or not move_duration: move_duration = 'infinite' + if editcreate_duration == 'none' or not editcreate_duration: + editcreate_duration = 'infinite' + if move_duration == 'none' or not move_duration: + move_duration = 'infinite' # Get cascading - if cascading == False: + if not cascading: cascading = '0' else: if editcreate != 'sysop' or move != 'sysop' or not self.exists(): @@ -3848,7 +3851,7 @@ predata['mwProtect-reason'] = reason - if not self.exists(): #and self.site().versionnumber() >= : + if not self.exists(): # and self.site().versionnumber() >= : #create protect predata['mwProtect-level-create'] = editcreate predata['wpProtectExpirySelection-create'] = editcreate_duration @@ -9056,6 +9059,7 @@ # Set socket timeout socket.setdefaulttimeout(config.socket_timeout) + def writeToCommandLogFile(): """ Save the name of the called module along with all parameters to -- To view, visit https://gerrit.wikimedia.org/r/79302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida8b6b45dc63c49cf1f1e494cf54f427f48e854a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] dates + typo fix - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: dates + typo fix ...................................................................... dates + typo fix Change-Id: Ia38dc2a38abf5731c9676991946f4c0a2d3198b3 --- M README-conversion.txt M generate_user_files.py M pwb.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/README-conversion.txt b/README-conversion.txt index 99dcf7a..58078da 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -115,7 +115,7 @@ The User object has been moved from the userlib module to the pywikibot namespace. Any references to "userlib.User" can be replaced by -"pywikibot.User", but the old for mis retained for backwards-compatibility. +"pywikibot.User", but the old form is retained for backwards-compatibility. The following changes have occured in the User object: diff --git a/generate_user_files.py b/generate_user_files.py index ddd2e6a..b8a0064 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ Script to create user files (user-config.py, user-fixes.py) """ # -# (C) Pywikipedia team, 2010-2012 +# (C) Pywikipedia team, 2010-2013 # __version__ = '$Id$' # diff --git a/pwb.py b/pwb.py index 9e7a7d9..ae732ed 100644 --- a/pwb.py +++ b/pwb.py @@ -5,7 +5,7 @@ and it will use the package directory to store all user files, will fix up search paths so the package does not need to be installed, etc. """ -# (C) Pywikipedia team, 2012 +# (C) Pywikipedia team, 2013 # __version__ = '$Id$' # -- To view, visit https://gerrit.wikimedia.org/r/79174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia38dc2a38abf5731c9676991946f4c0a2d3198b3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Sumanah <sumanah(a)wikimedia.org> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] new wikivoyage project "vi" - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: new wikivoyage project "vi" ...................................................................... new wikivoyage project "vi" Change-Id: Ie8048c0a6e6a6ea7dff5627be9f76cc2d4af0db6 --- M families/wikivoyage_family.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikivoyage_family.py b/families/wikivoyage_family.py index 34bf323..ec104ad 100644 --- a/families/wikivoyage_family.py +++ b/families/wikivoyage_family.py @@ -6,13 +6,14 @@ import family + class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() self.name = 'wikivoyage' self.languages_by_size = [ 'en', 'de', 'pt', 'nl', 'fr', 'it', 'pl', 'ru', 'es', 'sv', 'ro', - 'uk', 'he', 'el', + 'uk', 'he', 'el', 'vi', ] self.langs = dict([(lang, '%s.wikivoyage.org' % lang) @@ -48,6 +49,7 @@ 'ru': u'Wikivoyage', 'sv': u'Wikivoyage', 'uk': u'Вікімандри', + 'vi': u'Wikivoyage', } self.namespaces[5] = { @@ -65,6 +67,7 @@ 'ru': u'Обсуждение Wikivoyage', 'sv': u'Wikivoyagediskussion', 'uk': u'Обговорення Вікімандри', + 'vi': u'Thảo luận Wikivoyage', } self.namespaces[100] = { -- To view, visit https://gerrit.wikimedia.org/r/78908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8048c0a6e6a6ea7dff5627be9f76cc2d4af0db6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] update mw version to 1.22wmf12 - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: update mw version to 1.22wmf12 ...................................................................... update mw version to 1.22wmf12 Change-Id: I9ceb5fa7c781171e7dc84eff871452d885035007 --- M family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 4c15a05..871519d 100644 --- a/family.py +++ b/family.py @@ -4722,7 +4722,7 @@ """Return Wikimedia projects version number as a string.""" # Don't use this, use versionnumber() instead. This only exists # to not break family files. - return '1.22wmf10' + return '1.22wmf12' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/78904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ceb5fa7c781171e7dc84eff871452d885035007 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] - remove undocumented and obsolete -dry option which is done... - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: - remove undocumented and obsolete -dry option which is done by global option -simulate - replace Page.site() with Page.site like in core - some pep8 changes ...................................................................... - remove undocumented and obsolete -dry option which is done by global option -simulate - replace Page.site() with Page.site like in core - some pep8 changes Change-Id: I58deaf2d1cd86f77c01e63080ccdd9255b42fbea --- M featured.py 1 file changed, 17 insertions(+), 18 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/featured.py b/featured.py index 277ad7b..eb7f37e 100644 --- a/featured.py +++ b/featured.py @@ -346,7 +346,7 @@ articles.append(p) # Article talk (like in English) elif p.namespace() == 1 and site.lang != 'el': - articles.append(pywikibot.Page(p.site(), + articles.append(pywikibot.Page(p.site, p.title(withNamespace=False))) pywikibot.output( '\03{lightred}** wikipedia:%s has %i %s articles\03{default}' @@ -371,6 +371,7 @@ if p.site() == oursite: ourpage = p break + if not ourpage: if not quiet: pywikibot.output(u"%s -> no corresponding page in %s" @@ -410,6 +411,7 @@ if p.site() == page.site(): backpage = p break + if not backpage: pywikibot.output(u"%s -> no back interwiki ref" % page.title()) return @@ -448,8 +450,7 @@ return templates -def featuredWithInterwiki(fromsite, tosite, template_on_top, pType, quiet, - dry=False): +def featuredWithInterwiki(fromsite, tosite, template_on_top, pType, quiet): if not fromsite.lang in cache: cache[fromsite.lang] = {} if not tosite.lang in cache[fromsite.lang]: @@ -474,7 +475,8 @@ continue if a.title() in cc: - pywikibot.output(u"(cached) %s -> %s" % (a.title(), cc[a.title()])) + pywikibot.output(u"(cached) %s -> %s" + % (a.title(), cc[a.title()])) continue if a.isRedirectPage(): @@ -520,12 +522,11 @@ (u" {{%s|%s}}" % (templatelist[0], fromsite.lang)) + text[m.end():]) - if not dry: - try: - atrans.put(text, comment) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' - % atrans.title()) + try: + atrans.put(text, comment) + except pywikibot.LockedPage: + pywikibot.output(u'Page %s is locked!' + % atrans.title()) cc[a.title()] = atrans.title() else: if atrans: @@ -542,12 +543,11 @@ i18n.twtranslate(site, 'featured-former', {'page': unicode(a)})) text = re.sub(re_Link_FA, '', text) - if not dry: - try: - atrans.put(text, comment) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked!' - % atrans.title()) + try: + atrans.put(text, comment) + except pywikibot.LockedPage: + pywikibot.output(u'Page %s is locked!' + % atrans.title()) else: pywikibot.output(u"(already done)") cc[a.title()] = atrans.title() @@ -665,8 +665,7 @@ break elif fromsite != pywikibot.getSite(): featuredWithInterwiki(fromsite, pywikibot.getSite(), - template_on_top, processType, quiet, - pywikibot.simulate) + template_on_top, processType, quiet) except KeyboardInterrupt: pywikibot.output('\nQuitting program...') finally: -- To view, visit https://gerrit.wikimedia.org/r/78817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58deaf2d1cd86f77c01e63080ccdd9255b42fbea Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits