Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13437 discussions

[Gerrit] pep8-ified botirc.py - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified botirc.py ...................................................................... pep8-ified botirc.py Change-Id: Iec4d4bed80318a15ee53f2af5ac8ea1dbb0dc4e0 --- M pywikibot/botirc.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index 7dd0897..bda0284 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -18,7 +18,8 @@ # scripts, instead of writing each one from scratch. -import logging, logging.handlers +import logging +import logging.handlers # all output goes thru python std library "logging" module import re @@ -82,12 +83,12 @@ if not ('N' in match.group('flags')): return try: - msg = unicode(e.arguments()[0],'utf-8') + msg = unicode(e.arguments()[0], 'utf-8') except UnicodeDecodeError: return if self.other_ns.match(msg): return - name = msg[8:msg.find(u'14',9)] + name = msg[8:msg.find(u'14', 9)] text = pywikibot.comms.http.request(self.site, self.api_url) entry = self.api_found.findall(text) page = pywikibot.Page(self.site, name) @@ -97,7 +98,7 @@ return except pywikibot.IsRedirectPage: return - pywikibot.output(str(( entry[0], name ))) + pywikibot.output(str((entry[0], name))) def on_dccmsg(self, c, e): pass -- To view, visit https://gerrit.wikimedia.org/r/79588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec4d4bed80318a15ee53f2af5ac8ea1dbb0dc4e0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified config2.py - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified config2.py ...................................................................... pep8-ified config2.py Note: test for variables was adapted slightly to prevent E721 / do not compare types, use ‘isinstance()’ from triggering. Instead of comparing the old type with type(None), the old *value* is compared to None instead. This is also a nicer check conceptually. Change-Id: Ibdfc17e86814a905e212bd454deba36c7995df4f --- M pywikibot/config2.py 1 file changed, 21 insertions(+), 14 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index d6ad0bd..8fec8c0 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -7,8 +7,9 @@ # __version__ = '$Id$' -import os, re +import os import sys as __sys +import re import platform # IMPORTANT: @@ -72,8 +73,8 @@ # # Security Connection for Wikimedia Projects # -use_SSL_onlogin = False # if available, use SSL when logging in -use_SSL_always = False # if available, use SSL for all API queries +use_SSL_onlogin = False # if available, use SSL when logging in +use_SSL_always = False # if available, use SSL for all API queries # Available security projects available_ssl_project = [ @@ -92,6 +93,7 @@ # WARNING: this should NEVER be used in practice, ALWAYS supply a more # relevant summary for bot edits default_edit_summary = u'Wikipedia python library v.2' + # Get the names of all known families, and initialize # with empty dictionaries @@ -127,7 +129,7 @@ elif _win_version == 6: base_dir = os.path.join(home, "AppData\\Roaming", NAME) else: - base_dir = os.path.join(home, "."+NAME) + base_dir = os.path.join(home, "." + NAME) if not os.path.isdir(base_dir): os.makedirs(base_dir, mode=0700) if not os.path.isabs(base_dir): @@ -144,9 +146,9 @@ _base_dir = _get_base_dir() # families/ is a subdirectory of the directory in which config.py is found for _filename in os.listdir( - os.path.join(os.path.dirname(__file__), 'families')): + os.path.join(os.path.dirname(__file__), 'families')): if _filename.endswith("_family.py"): - familyName = _filename[ : -len("_family.py")] + familyName = _filename[:-len("_family.py")] usernames[familyName] = {} sysopnames[familyName] = {} disambiguation_comment[familyName] = {} @@ -180,8 +182,8 @@ # transliteration_target = console_encoding # After emitting the warning, this last option will be set. -transliteration_target = 'not set' - +transliteration_target = 'not set' + # The encoding in which textfiles are stored, which contain lists of page # titles. The most used is: 'utf-8'. 'utf-8-sig' recognizes BOM but it is # available on Python 2.5 or higher. For a complete list please see: @@ -591,6 +593,7 @@ # End of configuration section # ============================ + def makepath(path): """Return a normalized absolute version of the path argument. @@ -610,6 +613,7 @@ os.makedirs(dpath) return os.path.normpath(os.path.abspath(path)) + def datafilepath(*filename): """Return an absolute path to a data file in a standard location. @@ -621,11 +625,12 @@ import os.path return makepath(os.path.join(base_dir, *filename)) + def shortpath(path): """Return a file path relative to config.base_dir.""" import os.path if path.startswith(base_dir): - return path[len(base_dir) + len(os.path.sep) : ] + return path[len(base_dir) + len(os.path.sep):] return path # System-level and User-level changes. # Store current variables and their types. @@ -651,10 +656,10 @@ execfile(_filename) else: print "WARNING: Skipped '%(fn)s': writeable by others."\ - % {'fn' :_filename} + % {'fn': _filename} else: print "WARNING: Skipped '%(fn)s': owned by someone else."\ - % {'fn' :_filename} + % {'fn': _filename} # Test for obsoleted and/or unknown variables. for _key, _val in globals().items(): @@ -663,7 +668,9 @@ elif _key in _gl: nt = type(_val) ot = _tp[_key] - if nt == ot or _val is None or ot == type(None): + ov = _glv[_key] + + if nt == ot or _val is None or ov is None: # nopep8 pass elif nt is int and (ot is float or ot is bool): pass @@ -695,8 +702,8 @@ else: transliteration_target = None elif transliteration_target in ('None', 'none'): - transliteration_target = None - + transliteration_target = None + # Save base_dir for use by other modules base_dir = _base_dir -- To view, visit https://gerrit.wikimedia.org/r/79587 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdfc17e86814a905e212bd454deba36c7995df4f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add pagegenerator.py based argument handling to delete.py - change (pywikibot/compat)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Add pagegenerator.py based argument handling to delete.py ...................................................................... Add pagegenerator.py based argument handling to delete.py Added by request of infovarius Corrected version of r78811 Change-Id: I386328c62b1bbeb7022a620f8e95d25a67686371 --- M delete.py 1 file changed, 27 insertions(+), 73 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/delete.py b/delete.py index 5de27d7..d1e2c13 100644 --- a/delete.py +++ b/delete.py @@ -59,6 +59,7 @@ page.delete(self.summary, not self.always, throttle = True) def main(): + genFactory = pagegenerators.GeneratorFactory() pageName = '' singlePage = '' summary = '' @@ -71,50 +72,19 @@ doImages = False undelete = False fileName = '' - gen = None + generator = None # read command line parameters for arg in pywikibot.handleArgs(): if arg == '-always': always = True - elif arg.startswith('-file'): - if len(arg) == len('-file'): - fileName = pywikibot.input( - u'Enter name of file to delete pages from:') - else: - fileName = arg[len('-file:'):] elif arg.startswith('-summary'): if len(arg) == len('-summary'): summary = pywikibot.input(u'Enter a reason for the deletion:') else: summary = arg[len('-summary:'):] - elif arg.startswith('-cat'): - doCategory = True - if len(arg) == len('-cat'): - pageName = pywikibot.input( - u'Enter the category to delete from:') - else: - pageName = arg[len('-cat:'):] elif arg.startswith('-nosubcats'): deleteSubcategories = False - elif arg.startswith('-links'): - doLinks = True - if len(arg) == len('-links'): - pageName = pywikibot.input(u'Enter the page to delete from:') - else: - pageName = arg[len('-links:'):] - elif arg.startswith('-ref'): - doRef = True - if len(arg) == len('-ref'): - pageName = pywikibot.input(u'Enter the page to delete from:') - else: - pageName = arg[len('-ref:'):] - elif arg.startswith('-page'): - doSinglePage = True - if len(arg) == len('-page'): - pageName = pywikibot.input(u'Enter the page to delete:') - else: - pageName = arg[len('-page:'):] elif arg.startswith('-images'): doImages = True if len(arg) == len('-images'): @@ -124,57 +94,41 @@ pageName = arg[len('-images'):] elif arg.startswith('-undelete'): undelete = True - + else: + genFactory.handleArg(arg) + if not summary: + if arg.startswith('-category'): + summary = i18n.twtranslate(mysite, 'delete-from-category',{'page': pageName}) + elif arg.startswith('-links'): + summary = i18n.twtranslate(mysite, 'delete-linked-pages', {'page': pageName}) + elif arg.startswith('-ref'): + summary = i18n.twtranslate(mysite, 'delete-referring-pages', {'page': pageName}) + elif arg.startswith('-file'): + summary = i18n.twtranslate(mysite, 'delete-from-file') mysite = pywikibot.getSite() - if doSinglePage: - if not summary: - summary = pywikibot.input(u'Enter a reason for the %sdeletion:' - % ['', 'un'][undelete]) - page = pywikibot.Page(mysite, pageName) - gen = iter([page]) - elif doCategory: - if not summary: - summary = i18n.twtranslate(mysite, 'delete-from-category', - {'page': pageName}) - ns = mysite.category_namespace() - categoryPage = catlib.Category(mysite, ns + ':' + pageName) - gen = pagegenerators.CategorizedPageGenerator( - categoryPage, recurse=deleteSubcategories) - elif doLinks: - if not summary: - summary = i18n.twtranslate(mysite, 'delete-linked-pages', - {'page': pageName}) - pywikibot.setAction(summary) - linksPage = pywikibot.Page(mysite, pageName) - gen = pagegenerators.LinkedPageGenerator(linksPage) - elif doRef: - if not summary: - summary = i18n.twtranslate(mysite, 'delete-referring-pages', - {'page': pageName}) - refPage = pywikibot.Page(mysite, pageName) - gen = pagegenerators.ReferringPageGenerator(refPage) - elif fileName: - if not summary: - summary = i18n.twtranslate(mysite, 'delete-from-file') - gen = pagegenerators.TextfilePageGenerator(fileName) - elif doImages: + if doImages: if not summary: summary = i18n.twtranslate(mysite, 'delete-images', {'page': pageName}) page = pywikibot.Page(mysite, pageName) - gen = pagegenerators.ImagesPageGenerator(page) - - if gen: + generator = pagegenerators.ImagesPageGenerator(page) + if not summary: + summary = pywikibot.input(u'Enter a reason for the %sdeletion:' + % ['', 'un'][undelete]) + if not generator: + generator = genFactory.getCombinedGenerator() + if not generator: + # syntax error, show help text from the top of this file + pywikibot.showHelp('delete') + return + if generator: pywikibot.setAction(summary) # We are just deleting pages, so we have no need of using a preloading # page generator to actually get the text of those pages. - bot = DeletionRobot(gen, summary, always, undelete) + bot = DeletionRobot(generator, summary, always, undelete) bot.run() - else: - pywikibot.showHelp(u'delete') - if __name__ == "__main__": try: main() finally: - pywikibot.stopme() + pywikibot.stopme() \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/79465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I386328c62b1bbeb7022a620f8e95d25a67686371 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> 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

1 0

[Gerrit] Ad new i18n file for blockpageschecker.py - change (pywikibot/i18n)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Ad new i18n file for blockpageschecker.py ...................................................................... Ad new i18n file for blockpageschecker.py Change-Id: I7dd4f4f5ff678136dfd19c3f554a825e9fc5f5fe --- A blockpageschecker.py 1 file changed, 30 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/blockpageschecker.py b/blockpageschecker.py new file mode 100644 index 0000000..933c6be --- /dev/null +++ b/blockpageschecker.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +msg = { + 'ar': { + 'blockpageschecker-summary': u'بوت: حذف قالب قديم', + }, + 'en': { + 'blockpageschecker-summary': u'Bot: Deleting out-dated template', + }, + 'fr': { + 'blockpageschecker-summary': u'Robot: Mise à jour des bandeaux de protection', + }, + 'he': { + 'blockpageschecker-summary': u'בוט: מסיר תבנית שעבר זמנה', + }, + 'it': { + 'blockpageschecker-summary': u'Bot: Tolgo o sistemo template di avviso blocco', + }, + 'ja': { + 'blockpageschecker-summary': u'ロボットによる: 保護テンプレート除去', + }, + 'pt': { + 'blockpageschecker-summary': u'Bot: Retirando predefinição de proteção', + }, + 'qqq': { + 'blockpageschecker-summary': u'Edit summary for blockpageschecker report', + }, + 'zh': { + 'blockpageschecker-summary': u'機器人: 移除過期的保護模板', + }, +} -- To view, visit https://gerrit.wikimedia.org/r/79573 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dd4f4f5ff678136dfd19c3f554a825e9fc5f5fe Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] update namespace aliases - change (pywikibot/compat)
by Merlijn van Deen (Code Review) 18 Aug '13

18 Aug '13

Merlijn van Deen has submitted this change and it was merged. Change subject: update namespace aliases ...................................................................... update namespace aliases Change-Id: I48d49e3e4772ff510a7aa7cc5e1c5b0be65df715 --- M families/wikipedia_family.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index 639aa46..9ae6247 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -734,6 +734,7 @@ 'si': u'ද්වාරය', 'sk': u'Portál', 'sl': u'Portal', + 'so': u'Portal', 'sq': u'Portal', 'sr': u'Портал', 'su': u'Portal', @@ -840,6 +841,7 @@ 'si': [u'ද්වාරය සාකච්ඡාව', u'Portal talk'], 'sk': u'Diskusia k portálu', 'sl': u'Pogovor o portalu', + 'so': u'Portal talk', 'sq': u'Portal diskutim', 'sr': u'Разговор о порталу', 'su': u'Obrolan portal', -- To view, visit https://gerrit.wikimedia.org/r/79571 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48d49e3e4772ff510a7aa7cc5e1c5b0be65df715 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] remove wrong item for uz lang - change (pywikibot/i18n)
by Xqt (Code Review) 18 Aug '13

18 Aug '13

Xqt has submitted this change and it was merged. Change subject: remove wrong item for uz lang ...................................................................... remove wrong item for uz lang Change-Id: I5a25a5454c703bbede9aec1c2a587f79ca0e72b6 --- M redirect.py 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/redirect.py b/redirect.py index 1e8f066..7f7d1bc 100644 --- a/redirect.py +++ b/redirect.py @@ -955,11 +955,6 @@ 'ur': { 'redirect-fix-double': u'روبالہ: درستگی دوہرا رجوع مکرر بجانب %(to)s', }, - # Author: CoderSI - # Author: Xqt - 'uz': { - 'redirect-broken-redirect-template': u'!!!Fuzzy{{db-r1}}', - }, # Author: Alunardon90 # Author: Candalua # Author: GatoSelvadego -- To view, visit https://gerrit.wikimedia.org/r/78788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a25a5454c703bbede9aec1c2a587f79ca0e72b6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Siebrand <siebrand(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Fixup for r77341: 'globals' should be 'global' - change (pywikibot/compat)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Fixup for r77341: 'globals' should be 'global' ...................................................................... Fixup for r77341: 'globals' should be 'global' Change-Id: Id16d18958c735e594605467d63ff716e38d6c039 --- M externals/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index c58c375..e7db1c4 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -210,7 +210,7 @@ return v == 'Y' or v == 'YES' def show_patch_question(): - globals _patch_permission + global _patch_permission if _patch_permission is None: lowlevel_warning("Give externals permission to execute the patch command?" " (y/N)") -- To view, visit https://gerrit.wikimedia.org/r/79564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id16d18958c735e594605467d63ff716e38d6c039 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add an ItemPage.iterlinks function to yield sitelinks - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

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

1 0

[Gerrit] ask for permission to run patch command warning that several... - change (pywikibot/compat)
by jenkins-bot (Code Review) 18 Aug '13

18 Aug '13

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

1 0

[Gerrit] adopt version handling and output to transition from SVN to ... - change (pywikibot/compat)
by DrTrigon (Code Review) 17 Aug '13

17 Aug '13

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

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits