Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13379 discussions

[Gerrit] set valid protocol for 'client', remove 'repo' from family f... - change (pywikibot/compat)
by jenkins-bot (Code Review) 11 Sep '13

11 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: set valid protocol for 'client', remove 'repo' from family file, wikidata-test-repo.wikimedia.de is no longer availlable remove overriding defaults, they are no longer needed. ...................................................................... set valid protocol for 'client', remove 'repo' from family file, wikidata-test-repo.wikimedia.de is no longer availlable remove overriding defaults, they are no longer needed. Change-Id: I48ec1463d1b6bf87519e741f301b0d3a72aa9b51 --- M families/wikidata_family.py 1 file changed, 6 insertions(+), 20 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikidata_family.py b/families/wikidata_family.py index bf7bbe0..ac801d4 100644 --- a/families/wikidata_family.py +++ b/families/wikidata_family.py @@ -13,20 +13,11 @@ self.name = 'wikidata' self.langs = { 'wikidata': 'www.wikidata.org', - 'repo': 'wikidata-test-repo.wikimedia.de', 'client': 'wikidata-test-client.wikimedia.de', 'test': 'test.wikidata.org', } # Override defaults - self.namespaces[0]['repo'] = [u'', u'Item'] - self.namespaces[1]['repo'] = [u'Talk', u'Item talk'] - del(self.namespaces[828]['_default']) - del(self.namespaces[829]['_default']) - self.namespaces[828]['test'] = u'Module' - self.namespaces[829]['test'] = u'Module talk' - self.namespaces[828]['wikidata'] = u'Module' - self.namespaces[829]['wikidata'] = u'Module talk' # Most namespaces are inherited from family.Family. # Translation used on all wikis for the different namespaces. @@ -35,18 +26,10 @@ self.namespaces[4] = { '_default': [u'Wikidata', u'WD', 'Project'], 'client': u'Test Wikipedia', - 'repo': u'Testwiki', } self.namespaces[5] = { '_default': [u'Wikidata talk', u'WT', 'Project talk'], 'client': u'Test Wikipedia talk', - 'repo': u'Testwiki talk', - } - self.namespaces[102] = { - 'repo': u'Property', - } - self.namespaces[103] = { - 'repo': u'Property talk', } self.namespaces[120] = { 'test': u'Property', @@ -65,12 +48,10 @@ 'wikidata': u'Query talk', } self.namespaces[1198] = { - 'repo': u'Translations', 'test': u'Translations', 'wikidata': u'Translations', } self.namespaces[1199] = { - 'repo': u'Translations talk', 'test': u'Translations talk', 'wikidata': u'Translations talk', } @@ -93,4 +74,9 @@ elif code == 'test': return ('test', 'wikidata') else: - return ('repo', 'wikidata') + return (None, None) + + def protocol(self, code): + if code == 'client': + return 'http' + return super(Family, self).protocol(code) -- To view, visit https://gerrit.wikimedia.org/r/83359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48ec1463d1b6bf87519e741f301b0d3a72aa9b51 Gerrit-PatchSet: 4 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

1 0

[Gerrit] Allow both upper- and lowercase wikibase IDs - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Sep '13

10 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Allow both upper- and lowercase wikibase IDs ...................................................................... Allow both upper- and lowercase wikibase IDs Change-Id: Id7c29981e8dde7c041a16b43bcc2658faf7b0c94 --- M pywikibot/site.py 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Aude: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 43ec1df..17566e9 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3515,7 +3515,16 @@ #Store it for 100 years req = api.CachedRequest(expiry, site=self, **params) data = req.submit() - dtype = data['entities'][prop.getID()]['datatype'] + + # the IDs returned from the API can be upper or lowercase, depending + # on the version. See for more information: + # https://bugzilla.wikimedia.org/show_bug.cgi?id=53894 + # http://lists.wikimedia.org/pipermail/wikidata-tech/2013-September/000296.ht… + try: + dtype = data['entities'][prop.getID()]['datatype'] + except KeyError: + dtype = data['entities'][prop.getID().lower()]['datatype'] + if dtype == 'globe-coordinate': dtype = 'globecoordinate' #TODO Fix this -- To view, visit https://gerrit.wikimedia.org/r/83661 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7c29981e8dde7c041a16b43bcc2658faf7b0c94 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Aude <aude.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Few more things for uppercase ids - change (pywikibot/core)
by Legoktm (Code Review) 10 Sep '13

10 Sep '13

Legoktm has submitted this change and it was merged. Change subject: Few more things for uppercase ids ...................................................................... Few more things for uppercase ids Change-Id: I9b28ee8c597836d37d6e71eb18474466b4e04033 --- M pywikibot/page.py M tests/wikibase_tests.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 3b250c0..b02879a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2673,7 +2673,7 @@ """ WikibasePage.__init__(self, source, title, ns=120) self.id = self.title(withNamespace=False).upper() - if not self.id.startswith(u'p'): + if not self.id.startswith(u'P'): raise ValueError(u"'%s' is not a property page!" % self.title()) def get(self, force=False, *args): @@ -2698,7 +2698,7 @@ def __init__(self, site, title): WikibasePage.__init__(self, site, title, ns=122) self.id = self.title(withNamespace=False).upper() - if not self.id.startswith(u'u'): + if not self.id.startswith(u'U'): raise ValueError(u"'%s' is not a query page!" % self.title()) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index fa3facd..3896392 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -36,7 +36,7 @@ self.assertTrue('HomePage' in item.aliases['en']) self.assertEqual(item.namespace(), 0) item2 = pywikibot.ItemPage(repo, 'q5296') - self.assertEqual(item2.getID(), 'q5296') + self.assertEqual(item2.getID(), 'Q5296') self.assertEqual(item.labels['en'], 'Main Page') prop = pywikibot.PropertyPage(repo, 'Property:P21') self.assertEqual(prop.getType(), 'wikibase-item') @@ -60,7 +60,7 @@ def setUp(self): super(TestLinks, self).setUp() self.wdp = pywikibot.ItemPage(wikidata, 'Q60') - self.wdp.id = 'q60' + self.wdp.id = 'Q60' self.wdp._content = json.load(open(os.path.join(os.path.split(__file__)[0], 'pages', 'Q60_only_sitelinks.wd'))) self.wdp.get() -- To view, visit https://gerrit.wikimedia.org/r/83653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b28ee8c597836d37d6e71eb18474466b4e04033 Gerrit-PatchSet: 1 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: jenkins-bot

1 0

[Gerrit] Wikibase now uses uppercase ids. - change (pywikibot/core)
by Ladsgroup (Code Review) 10 Sep '13

10 Sep '13

Ladsgroup has submitted this change and it was merged. Change subject: Wikibase now uses uppercase ids. ...................................................................... Wikibase now uses uppercase ids. We now force IDs to be uppercase rather than lowercase. Change-Id: I19a33f60ea72e447f8a971279f149947d4e46bfd Announcement: http://lists.wikimedia.org/pipermail/wikidata-tech/2013-September/000296.ht… --- M pywikibot/page.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Verified; Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index a20d7ce..3b250c0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2506,7 +2506,7 @@ @param title: id number of item, "Q###" """ super(ItemPage, self).__init__(site, title, ns=0) - self.id = title.lower() + self.id = title.upper() # This might cause issues if not ns0? @classmethod def fromPage(cls, page): @@ -2672,7 +2672,7 @@ @param title: page name of property, like "Property:P##" """ WikibasePage.__init__(self, source, title, ns=120) - self.id = self.title(withNamespace=False).lower() + self.id = self.title(withNamespace=False).upper() if not self.id.startswith(u'p'): raise ValueError(u"'%s' is not a property page!" % self.title()) @@ -2697,7 +2697,7 @@ """ def __init__(self, site, title): WikibasePage.__init__(self, site, title, ns=122) - self.id = self.title(withNamespace=False).lower() + self.id = self.title(withNamespace=False).upper() if not self.id.startswith(u'u'): raise ValueError(u"'%s' is not a query page!" % self.title()) -- To view, visit https://gerrit.wikimedia.org/r/83643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19a33f60ea72e447f8a971279f149947d4e46bfd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] login.py: use site.code instead of site.lang - change (pywikibot/core)
by jenkins-bot (Code Review) 08 Sep '13

08 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: login.py: use site.code instead of site.lang ...................................................................... login.py: use site.code instead of site.lang The code used for the site is not necessary the same as the language - this is clear for instance for commons (site.code = 'commons', site.lang = 'en') and wikidata. Changing this means logging in works for people using mysite = 'wikidata'; family = 'wikidata' where before this resulted in a cryptic en.wikidata is not a valid site, please remove it from your config error message. Change-Id: I978437feb4862a7f1fc688fcd9ba4dee6d315c67 --- M scripts/login.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/login.py b/scripts/login.py index afdc9a4..53638e6 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -81,7 +81,7 @@ namedict = config.usernames else: site = pywikibot.getSite() - namedict = {site.family.name: {site.lang: None}} + namedict = {site.family.name: {site.code: None}} for familyName in namedict: for lang in namedict[familyName]: try: -- To view, visit https://gerrit.wikimedia.org/r/82883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I978437feb4862a7f1fc688fcd9ba4dee6d315c67 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] ignore *.bak and *.log files - change (pywikibot/compat)
by jenkins-bot (Code Review) 08 Sep '13

08 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: ignore *.bak and *.log files ...................................................................... ignore *.bak and *.log files Change-Id: Ic47a48e00dc37baffbdb5d99927f1bfebff65870 --- M .gitignore 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 003bb53..d2f1bed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.bak +*.log *.pyc user-config.py user-fixes.py -- To view, visit https://gerrit.wikimedia.org/r/83358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic47a48e00dc37baffbdb5d99927f1bfebff65870 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

1 0

[Gerrit] update several namespace aliases, fix unicode error fot got-... - change (pywikibot/compat)
by jenkins-bot (Code Review) 08 Sep '13

08 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: update several namespace aliases, fix unicode error fot got-wiki ...................................................................... update several namespace aliases, fix unicode error fot got-wiki Change-Id: Icccddefb702500a56a38109d1693bc0563a9685c --- M families/wikipedia_family.py 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index 66ac5c9..d962c57 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -445,7 +445,7 @@ 'gl': u'Conversa Wikipedia', 'glk': u'بحث Wikipedia', 'gn': u'Vikipetã myangekõi', - 'got': u'??? Wikipedia ?????????', + 'got': u'𐌸𐌹𐍃 Wikipedia 𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰', 'gu': u'વિકિપીડિયા ચર્ચા', 'gv': u'Resooney Wikipedia', 'ha': u'Wikipedia talk', @@ -874,6 +874,7 @@ 'ba': u'Проект', 'bar': u'Buach', 'ca': u'Viquiprojecte', + 'ckb': u'ویکیپرۆژە', 'cs': u'Rejstřík', 'da': u'Artikeldata', 'eo': u'Projekto', @@ -894,6 +895,7 @@ 'lt': u'Vikiprojektas', 'lv': u'Vikiprojekts', 'oc': u'Projècte', + 'pfl': u'Buch', 'pl': u'Wikiprojekt', 'pt': u'Anexo', 'ro': u'Proiect', @@ -908,6 +910,7 @@ 'ba': u'Проект буйынса фекерләшеү', 'bar': u'Buach Dischkrian', 'ca': u'Viquiprojecte Discussió', + 'ckb': u'لێدوانی ویکیپرۆژە', 'cs': u'Diskuse k rejstříku', 'da': u'Artikeldatadiskussion', 'eo': u'Projekta diskuto', @@ -928,6 +931,7 @@ 'lt': u'Vikiprojekto aptarimas', 'lv': u'Vikiprojekta diskusija', 'oc': u'Discussion Projècte', + 'pfl': u'Buch Dischbediere', 'pl': u'Dyskusja wikiprojektu', 'pt': u'Anexo Discussão', 'ro': u'Discuție Proiect', @@ -946,6 +950,7 @@ 'fr': u'Référence', 'frr': u'Index', 'lt': u'Sąrašas', + 'pfl': u'Wort', 'pt': u'Livro', 'ru': u'Проект', } @@ -959,6 +964,7 @@ 'fr': u'Discussion Référence', 'frr': u'Index Diskussion', 'lt': u'Sąrašo aptarimas', + 'pfl': u'Wort Dischbediere', 'pt': u'Livro Discussão', 'ru': u'Обсуждение проекта', } @@ -967,6 +973,7 @@ 'als': u'Text', 'bar': u'Text', 'frr': u'Text', + 'pfl': u'Text', 'ru': u'Арбитраж', } @@ -974,6 +981,7 @@ 'als': u'Text Diskussion', 'bar': u'Text Dischkrian', 'frr': u'Text Diskussion', + 'pfl': u'Text Dischbediere', 'ru': u'Обсуждение арбитража', } @@ -982,6 +990,7 @@ 'bar': u'Spruch', 'en': u'Book', 'he': u'ספר', + 'pfl': u'Spruch', 'ro': u'Cod', 'yo': u'Ìwé', } @@ -991,6 +1000,7 @@ 'bar': u'Spruch Dischkrian', 'en': u'Book talk', 'he': u'שיחת ספר', + 'pfl': u'Spruch Dischbediere', 'ro': u'Discuție Cod', 'yo': u'Ọ̀rọ̀ ìwé', } @@ -998,17 +1008,20 @@ self.namespaces[110] = { 'als': u'Nochricht', 'bar': u'Nochricht', + 'pfl': u'Nochricht', } self.namespaces[111] = { 'als': u'Nochricht Diskussion', 'bar': u'Nochricht Dischkrian', + 'pfl': u'Nochricht Dischbediere', } self.namespaces[446] = { 'en': u'Education Program', 'he': u'הוראה', 'mk': u'Education Program', + 'pt': u'Education Program', 'sv': u'Education Program', } @@ -1016,6 +1029,7 @@ 'en': u'Education Program talk', 'he': u'שיחת הוראה', 'mk': u'Education Program talk', + 'pt': u'Education Program talk', 'sv': u'Education Program talk', } -- To view, visit https://gerrit.wikimedia.org/r/83357 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icccddefb702500a56a38109d1693bc0563a9685c 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

1 0

[Gerrit] Suggest git.wikimedia.org as httplib2 download site - change (pywikibot/core)
by jenkins-bot (Code Review) 08 Sep '13

08 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: Suggest git.wikimedia.org as httplib2 download site ...................................................................... Suggest git.wikimedia.org as httplib2 download site See Wieland Hoffmanns mail [1] for more details; this should prevent setup.py install from installing an non-functional httplib2 (that is: one with outdated SSL certificated) [1] http://article.gmane.org/gmane.comp.python.pywikipediabot.general/13432 Change-Id: Ia0f91237dde1565a6dd71206c2e0477690cf3855 --- M setup.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index a73bc36..db0ea02 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,9 @@ install_requires=[ 'httplib2>=0.6.0' ], + dependency_links=[ + 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format=gz…' + ], test_suite="tests", classifiers=[ 'License :: OSI Approved :: MIT License', -- To view, visit https://gerrit.wikimedia.org/r/83370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0f91237dde1565a6dd71206c2e0477690cf3855 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] update family file, update mw version to 1.22wmf15 - change (pywikibot/compat)
by jenkins-bot (Code Review) 08 Sep '13

08 Sep '13

jenkins-bot has submitted this change and it was merged. Change subject: update family file, update mw version to 1.22wmf15 ...................................................................... update family file, update mw version to 1.22wmf15 Change-Id: If1838c2ce26053de077153d05d7feef55c3d9c02 --- M family.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 255cc3d..1ccaaab 100644 --- a/family.py +++ b/family.py @@ -978,7 +978,7 @@ 'bxr': [u'Хэрэглэгшые хэлэлсэхэ', u'Обсуждение участника'], 'ca': [u'Usuari Discussió', u'Usuària discussió'], 'cbk-zam': [u'Usuario discusión', u'Usuario Discusión', u'Usuaria Discusión'], - 'ce': [u'Декъашхон дийцаре', u'Юзери дийца', u'Дийцаре декъашхо'], + 'ce': [u'Декъашхочун дийцаре', u'Декъашхон дийцаре', u'Дийцаре декъашхо', u'Юзери дийца'], 'ceb': u'Hisgot sa Gumagamit', 'ch': u'Kombetsasion ni muna\'sesetbi', 'ckb': [u'لێدوانی بەکارھێنەر', u'قسەی بەکارھێنەر'], @@ -4606,7 +4606,7 @@ 'bxr': u'Обсуждение модуля', 'ca': u'Mòdul Discussió', 'cbk-zam': u'Módulo discusión', - 'ce': u'Обсуждение модуля', + 'ce': u'Модулин дийцаре', 'cs': u'Diskuse k modulu', 'csb': u'Dyskusja modułu', 'cv': u'Обсуждение модуля', @@ -4722,10 +4722,10 @@ """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.22wmf12' + return '1.22wmf15' def shared_image_repository(self, code): return ('commons', 'commons') - + def protocol(self, code): return 'https' -- To view, visit https://gerrit.wikimedia.org/r/83356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1838c2ce26053de077153d05d7feef55c3d9c02 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

1 0

[Gerrit] Do not force preloading patch.exe for windows user. Ask for ... - change (pywikibot/compat)
by Xqt (Code Review) 08 Sep '13

08 Sep '13

Xqt has submitted this change and it was merged. Change subject: Do not force preloading patch.exe for windows user. Ask for it if needed only and prohibit this message every time a script was started. Otherwise automatic batch scripts could not run without operator inputs. Some additional PEP8 changes and small improv ...................................................................... Do not force preloading patch.exe for windows user. Ask for it if needed only and prohibit this message every time a script was started. Otherwise automatic batch scripts could not run without operator inputs. Some additional PEP8 changes and small improvements. Change-Id: Icc887384f2d8dea1a03c17213a212c7f5bbb3533 --- M externals/__init__.py 1 file changed, 106 insertions(+), 98 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index db6baf5..314c55d 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -31,26 +31,26 @@ # mercurial (hg) # patch (unix/linux & gnuwin32 version/flavour) modules_needed = { - 'patch.exe': ({}, # for win32 only, unix/linux is already equipped with a patch tool + 'patch.exe': ({}, # for win32 only, unix/linux is already equipped with a patch tool { 'url': 'http://downloads.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9…', 'path': 'bin/patch.exe'}, - {}), # OK + {}), # OK 'crontab': ({}, - #{ 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/master.zip', - # 'path': 'parse-crontab-master/crontab',}), # OK +## { 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/master.zip', +## 'path': 'parse-crontab-master/crontab',}), # OK { 'url': 'https://github.com/josiahcarlson/parse-crontab/archive/1ec538ff67df6a207993…', 'path': 'parse-crontab-1ec538ff67df6a207993a6c5b6988f4f628c5776/crontab',}, - {}), # OK + {}), # OK 'odf': ({}, - #{ 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.6.tar.gz', - # 'path': 'odfpy-0.9.6/odf',}), # OK +## { 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.6.tar.gz', +## 'path': 'odfpy-0.9.6/odf',}), # OK { 'url': 'https://pypi.python.org/packages/source/o/odfpy/odfpy-0.9.4.tar.gz', 'path': 'odfpy-0.9.4/odf'}, - {}), # OK + {}), # OK 'openpyxl': ({}, { 'url': 'https://bitbucket.org/ericgazoni/openpyxl/get/1.5.6.tar.gz', 'path': 'ericgazoni-openpyxl-e5934500ffac/openpyxl'}, - {}), # OK + {}), # OK # 'spelling': $ svn propedit svn:externals externals/. # spelling http://svn.wikimedia.org/svnroot/pywikipedia/trunk/spelling/ # $ git submodule add https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git externals/spelling @@ -58,46 +58,46 @@ 'linux-ubuntu': ['python-beautifulsoup']}, { 'url': 'https://pypi.python.org/packages/source/B/BeautifulSoup/BeautifulSoup-3.2.0…', 'path': 'BeautifulSoup-3.2.0/BeautifulSoup.py'}, - {}), # OK + {}), # OK 'irclib': ({'linux-fedora': ['python-irclib'], 'linux-ubuntu': ['python-irclib']}, - {}, # http://python-irclib.sourceforge.net/ - {}), # OK + {}, # http://python-irclib.sourceforge.net/ + {}), # OK 'mwparserfromhell': ({}, { 'url': 'https://github.com/earwig/mwparserfromhell/archive/v0.2.zip', - #{ 'url': 'https://github.com/earwig/mwparserfromhell/archive/master.zip', +## { 'url': 'https://github.com/earwig/mwparserfromhell/archive/master.zip', 'path': 'mwparserfromhell-0.2/mwparserfromhell'}, - {}), # OK + {}), # OK 'colormath': ({'linux-fedora': [], 'linux-ubuntu': ['python-colormath'],}, { 'url': 'https://github.com/gtaylor/python-colormath/archive/master.zip', 'path': 'python-colormath-master/colormath',}, - {}), # OK + {}), # OK 'jseg': ({}, { 'url': 'http://vision.ece.ucsb.edu/segmentation/jseg/software/jseg.zip', 'path': 'jseg', #$ diff -Nau --exclude="*.o" --exclude="*.pyc" --exclude="segdist_cpp*" TEST_jseg/ jseg/ > patch-jseg 'patch': 'patch-jseg'}, - {}), # OK + {}), # OK 'jseg/jpeg-6b': ({}, { 'url': 'http://vision.ece.ucsb.edu/segmentation/jseg/software/jpeg-6b.zip', 'path': 'jpeg-6b',}, - {}), # OK + {}), # OK '_mlpy': ({}, { 'url': 'http://downloads.sourceforge.net/project/mlpy/mlpy%203.5.0/mlpy-3.5.0.tar.gz', 'path': 'mlpy-3.5.0/mlpy'}, - {}), # OK + {}), # OK '_music21': ({}, { 'url': 'http://music21.googlecode.com/files/music21-1.4.0.tar.gz', 'path': 'music21-1.4.0', #$ diff -Naur --exclude="*.pyc" TEST__music21/ _music21/ > patch-music21 'patch': 'patch-music21'}, - {}), # OK + {}), # OK # TODO: vvv (future; enable for and use in 'catimages.py', patch needed) '_ocropus': ({}, {}, { 'url': 'https://code.google.com/p/ocropus', - 'rev': 'ocropus-0.6'}), # OK + 'rev': 'ocropus-0.6'}), # OK # TODO: vvv (further clean-up and unlink - check with 'svn list') # 'opencv': $ svn propedit svn:externals externals/. # opencv https://svn.toolserver.org/svnroot/drtrigon/externals/opencv @@ -111,7 +111,7 @@ 'opencv/haarcascades': ({}, { 'url': 'https://svn.toolserver.org/svnroot/drtrigon/externals/haarcascades-full.tar…', 'path': 'haarcascades'}, - {}), # OK + {}), # OK # 'pdfminer' is not used anymore/at the moment... # 'pycolorname': $ svn propset svn:externals 'pycolorname https://svn.toolserver.org/svnroot/drtrigon/externals/pycolorname' externals/. 'pydmtx': ({'linux-fedora': ['python-libdmtx'], @@ -120,11 +120,11 @@ 'path': 'dmtx-wrappers-master/python', #$ diff -Nau --exclude="*.pyc" TEST_pydmtx/ pydmtx/ > patch-pydmtx 'patch': 'patch-pydmtx'}, - {}), # OK + {}), # OK 'py_w3c': ({}, { 'url': 'https://bitbucket.org/nmb10/py_w3c/downloads/py_w3c-v0.1.0.tar.gz', 'path': 'py_w3c-0.1.0/py_w3c'}, - {}), # OK + {}), # OK # TODO: vvv (include) # 'TEST_slic': ({}, # { 'url': 'http://ivrg.epfl.ch/files/content/sites/ivrg/files/supplementary_material/R…', @@ -139,7 +139,7 @@ 'path': 'zbar-0.10', #$ diff -Nau --exclude="*.pyc" TEST__zbar/ _zbar/ > patch-zbar 'patch': 'patch-zbar'}, - {}), # OK + {}), # OK # TODO: vvv (include) # 'TEST__bob': ({}, # { 'url': 'https://www.idiap.ch/software/bob/packages/bob-1.1.2.zip', @@ -168,14 +168,14 @@ import os import sys import inspect -import wikipedia as pywikibot # sets externals path +import wikipedia as pywikibot # sets externals path #from pywikibot.comms import http # allow imports from externals sys.path.append(os.path.dirname(os.path.abspath(__file__))) -### BEGIN of VisTrails inspired and copied code ### ### ### ### ### ### ### ### +### BEGIN of VisTrails inspired and copied code ### def has_logger(): #return hasattr(sys.modules['wikipedia'], 'logger') @@ -190,7 +190,7 @@ if has_logger(): pywikibot.warning(text) else: - print "WARNING:", text + print "\nWARNING:", text def guess_system(): @@ -201,19 +201,20 @@ def show_question(module): lowlevel_warning("Required package missing: %s\n" "This package is not installed, but required by the file" - " '%s'." % (module, inspect.stack()[2][1])) + "\n'%s'." % (module, inspect.stack()[2][1])) lowlevel_warning("For more and additional information, please confer:\n" "http://www.mediawiki.org/wiki/Manual:Pywikipediabot/" "Installation#Dependencies") options = [(i+1) for i, item in enumerate(modules_needed[module]) if item] options += [0, 's', ''] options.sort() - options_msg = ("There are multiple ways to solve this:\n" - "RECOMMENDED for admins: always option [0] or the next available" - " (e.g. [1])\n" - "RECOMMENDED for non-admins: always option [2] (if available)\n" - "0: automatically determine the best of the following methods (may need\n" - " administrator privileges)\n") + options_msg = ("""There are multiple ways to solve this: +RECOMMENDED for admins: always option [0] or the next available (e.g. [1]) +RECOMMENDED for non-admins: always option [2] (if available) +0: automatically determine the best of the following methods (may need + administrator privileges) + +""") if 1 in options: options_msg += ("1: install the package using the OS package" " management system like yum\n" @@ -230,8 +231,8 @@ lowlevel_warning(options_msg) v = None while (v not in options): - lowlevel_warning("Please choose [%s, s - default]: " % - (", ".join(map(str, options[:-2])))) + lowlevel_warning("Please choose [%s, s - default]: " + % (", ".join(map(str, options[:-2])))) v = raw_input().lower() try: v = int(v) @@ -239,11 +240,13 @@ pass return v + def show_patch_question(): global _patch_permission if _patch_permission is None: - lowlevel_warning("Give externals permission to execute the patch command?" - " [y(es), n(o) - default]: ") + lowlevel_warning( + "Give externals permission to execute the patch command?" + " [y(es), n(o) - default]: ") v = raw_input().upper() _patch_permission = (v == 'Y') or (v == 'YES') return _patch_permission @@ -251,7 +254,9 @@ def python_module_exists(module_name): """python_module_exists(module_name): Boolean. -Returns if python module of given name can be safely imported.""" + Returns if python module of given name can be safely imported. + + """ module_name = module_name.replace(u'.py', u'') module_name = module_name[1:] if module_name[0] == u'_' else module_name @@ -301,9 +306,11 @@ def linux_install(dependency_dictionary): - """Tries to import a python module. If unsuccessful, tries to install -the appropriate bundle and then reimport. py_import tries to be smart -about which system it runs on.""" + """ Tries to import a python module. If unsuccessful, tries to install + the appropriate bundle and then reimport. py_import tries to be smart + about which system it runs on. + + """ # Ugly fix to avoid circular import distro = guess_system() @@ -330,54 +337,60 @@ def windows_install(dependency_dictionary): - lowlevel_warning(u'Not available in windows OS, use download mode (2) instead.') + lowlevel_warning( + u'Not available in windows OS, use download mode (2) instead.') return False # skip this in order to trigger 'download_install' next ### END of VisTrails inspired and copied code ### ### ### ### ### ### ### ### def download_install(package, module, path): - if package: - lowlevel_warning(u'Download package "%s" from %s' - % (module, package['url'])) - import mimetypes - import urllib2 - for i in range(3): - response = urllib2.urlopen(package['url']) - #response = http.request(pywikibot.getSite(), package['url'], - # no_hostname = True, back_response = True)[0] - if 'Content-Length' in response.headers: - break - lowlevel_warning(u'Could not retrieve data, re-trying ...') - lowlevel_warning(u'Size of download: %s byte(s)' - % response.headers['Content-Length']) - #mime = response.headers['Content-Type'].lower().split('/') - mime = mimetypes.guess_type(package['url'], - strict=True)[0].lower().split('/') - lowlevel_warning(u'MIME type: %s' % mime) + if not package: + return + lowlevel_warning(u'Download package "%s" from %s' + % (module, package['url'])) + import mimetypes + import urllib2 + for i in range(3): + response = urllib2.urlopen(package['url']) + #response = http.request(pywikibot.getSite(), package['url'], + # no_hostname = True, back_response = True)[0] + if 'Content-Length' in response.headers: + break + lowlevel_warning(u'Could not retrieve data, re-trying ...') + lowlevel_warning(u'Size of download: %s byte(s)' + % response.headers['Content-Length']) + #mime = response.headers['Content-Type'].lower().split('/') + mime = mimetypes.guess_type(package['url'], + strict=True)[0].lower().split('/') + lowlevel_warning(u'MIME type: %s' % mime) - lowlevel_warning(u'Extract package "%s" to %s.' - % (module, os.path.join(path, module))) - if len(mime) > 1: - import StringIO - if mime[1] in ['zip', 'x-zip-compressed']: - import zipfile - arch = zipfile.ZipFile(StringIO.StringIO(response.read())) - elif mime[1] == 'x-tar': - import tarfile - arch = tarfile.open(fileobj=StringIO.StringIO(response.read())) - else: - raise NotImplementedError(u'Not implemented mime type %s' - % mime[1]) - arch.extractall(os.path.join(path, '__setup_tmp/')) - arch.close() - import shutil - shutil.move(os.path.join(path, '__setup_tmp/', package['path']), - os.path.join(path, module)) - shutil.rmtree(os.path.join(path, '__setup_tmp/')) + lowlevel_warning(u'Extract package "%s" to %s.' + % (module, os.path.join(path, module))) + if len(mime) > 1: + import StringIO + if mime[1] in ['zip', 'x-zip-compressed']: + import zipfile + arch = zipfile.ZipFile(StringIO.StringIO(response.read())) + elif mime[1] == 'x-tar': + import tarfile + arch = tarfile.open(fileobj=StringIO.StringIO(response.read())) + else: + raise NotImplementedError(u'Not implemented mime type %s' + % mime[1]) + arch.extractall(os.path.join(path, '__setup_tmp/')) + arch.close() + import shutil + shutil.move(os.path.join(path, '__setup_tmp/', package['path']), + os.path.join(path, module)) + shutil.rmtree(os.path.join(path, '__setup_tmp/')) - result = 0 - if ('patch' in package) and show_patch_question(): + result = 0 + if 'patch' in package: + if sys.platform == 'win32': + if not check_setup('patch.exe'): + result = -1 + if result == 0 and show_patch_question(): lowlevel_warning(u'Applying patch to %s in order to finish' u' the installation of package "%s".' % (os.path.join(path, module), module)) @@ -391,9 +404,9 @@ os.path.join(path, package['patch'])) result = os.system(cmd) - lowlevel_warning(u'Package "%s" installed to %s.' - % (module, os.path.join(path, module))) - return (result == 0) + lowlevel_warning(u'Package "%s" installed to %s.' + % (module, os.path.join(path, module))) + return (result == 0) def mercurial_repo_install(package, module, path): @@ -423,19 +436,21 @@ dist = guess_system() func = dist.split(u'-')[0] + '_install' if sel in [0, 1]: - lowlevel_warning(u'(1) Trying to install by use of "%s" package management system:' % dist) + lowlevel_warning( + u'(1) Trying to install by use of "%s" package management system:' + % dist) if (func in globals()) and globals()[func](modules_needed[m][0]): - return + return sel if sel in [0, 2]: lowlevel_warning(u'(2) Trying to install by download from source URL:') if download_install(modules_needed[m][1], m, path): - return + return sel if sel in [0, 3]: lowlevel_warning(u'(3) Trying to install by use of mercurial:') - if (len(modules_needed[m]) > 2) and\ + if (len(modules_needed[m]) > 2) and \ mercurial_repo_install(modules_needed[m][2], m, path): - return - if sel in [0, 1, 2, 3]: + return sel + if sel in range(4): lowlevel_warning(u'No suitable package could be found nor installed!') lowlevel_warning(u'Several scripts might fail, if the modules are not' @@ -448,10 +463,3 @@ def check_setup_all(): for m in modules_order: check_setup(m) - - -# check and install modules NEEDED -if sys.platform == 'win32': - check_setup('patch.exe') -#check_setup('BeautifulSoup.py') -#check_setup('mwparserfromhell') -- To view, visit https://gerrit.wikimedia.org/r/83114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc887384f2d8dea1a03c17213a212c7f5bbb3533 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

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits