Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13497 discussions

[Gerrit] Populate the revision dict if lastrev is not in it. - change (pywikibot/core)
by Xqt (Code Review) 07 Oct '13

07 Oct '13

Xqt has submitted this change and it was merged. Change subject: Populate the revision dict if lastrev is not in it. ...................................................................... Populate the revision dict if lastrev is not in it. This allows avoinding a KeyError when the timestamp is extracted. Bug: 54995 Change-Id: I1f97dac718dc6b645b1b35af4a894b84e14e6385 --- M pywikibot/site.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/pywikibot/site.py b/pywikibot/site.py index f14132c..fff2fe0 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2691,6 +2691,8 @@ if bot: params["bot"] = "" if lastrev is not None: + if lastrev not in page._revisions: + self.loadrevisions(page) params["basetimestamp"] = page._revisions[lastrev].timestamp if minor: params['minor'] = "" -- To view, visit https://gerrit.wikimedia.org/r/87915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f97dac718dc6b645b1b35af4a894b84e14e6385 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Also run automated tests on python 2.6 - change (pywikibot/core)
by Legoktm (Code Review) 07 Oct '13

07 Oct '13

Legoktm has submitted this change and it was merged. Change subject: Also run automated tests on python 2.6 ...................................................................... Also run automated tests on python 2.6 Change-Id: I30ba78f380fea19672f7b4a8882f06fee6164f22 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved Addshore: Looks good to me, but someone else must approve diff --git a/.travis.yml b/.travis.yml index bae4070..857344d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python python: + - '2.6' - '2.7' install: -- To view, visit https://gerrit.wikimedia.org/r/87238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30ba78f380fea19672f7b4a8882f06fee6164f22 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Addshore <addshorewiki(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] Aligned doc string with implementation - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Oct '13

07 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: Aligned doc string with implementation ...................................................................... Aligned doc string with implementation Change-Id: Icdf09fadbf2d89c41119f5220bb461176f33eeb1 --- M generate_user_files.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 94ea4ec..914222a 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -25,7 +25,8 @@ provided in this argument 2. If the user has a PYWIKIBOT2_DIR environment variable, use the value of it - 3. Use (and if necessary create) a 'pywikibot' folder (Windows) or + 3. Use (and if necessary create) a 'pywikibot' folder under + 'Application Data' or 'AppData\Roaming' (Windows) or '.pywikibot' directory (Unix and similar) under the user's home directory. -- To view, visit https://gerrit.wikimedia.org/r/87911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icdf09fadbf2d89c41119f5220bb461176f33eeb1 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> 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

1 0

[Gerrit] sync version.py with core - change (pywikibot/compat)
by DrTrigon (Code Review) 05 Oct '13

05 Oct '13

DrTrigon has submitted this change and it was merged. Change subject: sync version.py with core ...................................................................... sync version.py with core Change-Id: I2b269d93b26c4d2f6849451a709863923cde0d85 --- M version.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: DrTrigon: Verified; Looks good to me, approved diff --git a/version.py b/version.py index 9832bd4..f3fc3a1 100644 --- a/version.py +++ b/version.py @@ -1,3 +1,4 @@ +#!/usr/bin/python # -*- coding: utf-8 -*- """ Script to determine the pywikipedia version (tag, revision and date) """ # @@ -15,7 +16,7 @@ import config if __name__ == '__main__': - print 'Pywikibot %s' % getversion() + print 'Pywikibot: %s' % getversion() print 'Release version: %s' % pywikibot.__release__ print 'Python: %s' % sys.version print 'config-settings:' -- To view, visit https://gerrit.wikimedia.org/r/87667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b269d93b26c4d2f6849451a709863923cde0d85 Gerrit-PatchSet: 1 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: jenkins-bot

1 0

[Gerrit] No handlers could be found for logger "pywiki" (1633) - change (pywikibot/compat)
by DrTrigon (Code Review) 05 Oct '13

05 Oct '13

DrTrigon has submitted this change and it was merged. Change subject: No handlers could be found for logger "pywiki" (1633) ...................................................................... No handlers could be found for logger "pywiki" (1633) https://sourceforge.net/p/pywikipediabot/bugs/1633/ Change-Id: I0d63aa63bd88050e938cb5fc47b2ca79e098fb0d --- M wikipedia.py 1 file changed, 30 insertions(+), 17 deletions(-) Approvals: DrTrigon: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index a044026..b3ed51f 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -9100,7 +9100,9 @@ if not logger: init_handlers() - if not logger.handlers: # init just once (if re-called) + logger = logging.getLogger('pywiki') + # three handlers allowed (Null, one for pwb.py, one for script) + if len(logger.handlers) < 3: moduleName = calledModuleName() if not moduleName: moduleName = "terminal-interface" @@ -9116,15 +9118,17 @@ fh = logging.handlers.RotatingFileHandler(filename=logfn, maxBytes=1024 * config.logfilesize, backupCount=config.logfilecount, - encoding='utf-8') + encoding="utf-8") else: - ver = int( '%02i%02i' % tuple(sys.version_info)[:2] ) - kwargs = { 'when': 'midnight', + ver = int('%02i%02i' % tuple(sys.version_info)[:2]) + kwargs = {'when': 'midnight', #'encoding': 'bz2-codec') - 'encoding': 'utf-8' } + 'encoding': "utf-8" } + if ver > int('0205'): # For Python > 2.5 (added in version 2.6) kwargs['utc'] = True + fh = logging.handlers.TimedRotatingFileHandler(logfn, **kwargs) # patch for "Issue 8117: TimedRotatingFileHandler doesn't rotate log # file at startup." @@ -9133,10 +9137,11 @@ if os.path.exists(logfn) and (ver == int('0206')): t = os.stat(logfn).st_mtime fh.rolloverAt = fh.computeRollover(t) - fh.setLevel(DEBUG) + + #fh.setLevel(DEBUG) # create console handler with a higher log level - ch = logging.StreamHandler() - ch.setLevel(DEBUG) + #ch = logging.StreamHandler() + #ch.setLevel(DEBUG) # create formatter and add it to the handlers (using LogRecord attributes) formatter = logging.Formatter( fmt="%(asctime)s %(caller_file)18s, %(caller_line)4s " @@ -9149,12 +9154,10 @@ logger.addHandler(fh) # output to logfile #logger.addHandler(ch) # output to terminal/shell console - logger = logging.getLogger('pywiki') + if header: + writelogheader() - if header: - writelogheader() - - logger.propagate = enabled + #logger.propagate = enabled def init_handlers(strm=None):#, logname=None, header=False): """Initialize logging system for terminal-based bots. @@ -9200,13 +9203,23 @@ # for prompts requiring user response logger = logging.getLogger() # root logger - if logger.handlers: # init just once (if re-called) - logger = logging.getLogger('pywiki') - return - logger.setLevel(DEBUG+1) # all records except DEBUG go to logger + + nh = logging.NullHandler() + logger.addHandler(nh) + logger.setLevel(DEBUG+1) + if hasattr(logger, 'captureWarnings'): logger.captureWarnings(True) # introduced in Python >= 2.7 + logger = logging.getLogger('pywiki') + logger.addHandler(nh) + logger.setLevel(DEBUG) + + logger.propagate = True + + return + + def writelogheader(): """ Save additional version, system and status info to the logfile in use, -- To view, visit https://gerrit.wikimedia.org/r/85411 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d63aa63bd88050e938cb5fc47b2ca79e098fb0d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Betacommand <betacommand(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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add PropertyPage.newClaim function for generating new Claim ... - change (pywikibot/core)
by jenkins-bot (Code Review) 05 Oct '13

05 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: Add PropertyPage.newClaim function for generating new Claim objects ...................................................................... Add PropertyPage.newClaim function for generating new Claim objects Change-Id: I4c938cfcd4af8e82a48796c4a7b0c4d3962e3257 --- M pywikibot/page.py 1 file changed, 8 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 57c3add..e17acf2 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2731,6 +2731,14 @@ self.type = self.repo.getPropertyType(self) return self.type + def newClaim(self, *args, **kwargs): + """ + Convenicence function to create a new claim object + for a specific property + @return: Claim + """ + return Claim(self.site, self.getID(), *args, **kwargs) + class QueryPage(WikibasePage): """ -- To view, visit https://gerrit.wikimedia.org/r/85163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c938cfcd4af8e82a48796c4a7b0c4d3962e3257 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> 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

1 0

[Gerrit] add Qualifier write support - change (pywikibot/core)
by jenkins-bot (Code Review) 04 Oct '13

04 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: add Qualifier write support ...................................................................... add Qualifier write support qualifier read/write is enabled by - editQualifier() api method in site.py - addQualifier() front end method in page.py Test edits: https://www.wikidata.org/w/index.php?title=Q10834790&diff=67432217&oldid=67… https://www.wikidata.org/w/index.php?title=Q10772647&diff=67447518&oldid=67… Change-Id: I917a69fff552be8b29a5d186d6b9f8df6eeea61d --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 52 insertions(+), 7 deletions(-) Approvals: FelixReimann: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index eefc5d9..57c3add 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2768,7 +2768,7 @@ if self.isQualifier and self.isReference: raise ValueError(u'Claim cannot be both a qualifier and reference.') self.sources = [] - self.qualifiers = {} + self.qualifiers = collections.defaultdict(list) self.target = None self.snaktype = 'value' self.rank = 'normal' @@ -2810,10 +2810,8 @@ for prop in data['qualifiers']: for qualifier in data['qualifiers'][prop]: qual = Claim.qualifierFromJSON(site, qualifier) - if prop in claim.qualifiers: - claim.qualifiers[prop].append(qual) - else: - claim.qualifiers[prop] = [qual] + claim.qualifiers[prop].append(qual) + return claim @staticmethod @@ -2935,6 +2933,17 @@ source[claim.getID()].append(claim) self.sources.append(source) + def addQualifier(self, qualifier, **kwargs): + """Adds the given qualifier + + @param qualifier: the qualifier to add + @type qualifier: Claim + """ + data = self.repo.editQualifier(self, qualifier, **kwargs) + qualifier.isQualifier = True + self.on_item.lastrevid = data['pageinfo']['lastrevid'] + self.qualifiers[qualifier.getID()].append(qualifier) + def _formatDataValue(self): """ Format the target into the proper JSON datavalue that Wikibase wants diff --git a/pywikibot/site.py b/pywikibot/site.py index 13477b0..f14132c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3616,8 +3616,8 @@ @param new Whether to create a new one if the "source" already exists @type new bool """ - if claim.isReference: - raise ValueError("The claim cannot be a reference.") + if claim.isReference or claim.isQualifier: + raise ValueError("The claim cannot have a source.") params = dict(action='wbsetreference', statement=claim.snak, ) @@ -3668,6 +3668,42 @@ return data @must_be(group='user') + def editQualifier(self, claim, qualifier, new=False, bot=True, **kwargs): + """ + Create/Edit a qualifier + + @param claim: A Claim object to add the qualifier to + @type claim: pywikibot.Claim + @param qualifier: A Claim object to be used as a qualifier + @type qualifier: pywikibot.Claim + """ + if claim.isReference or claim.isQualifier: + raise ValueError("The claim cannot have a qualifier.") + params = dict(action='wbsetqualifier', + claim=claim.snak, + ) + if claim.on_item: # I can't think of when this would be false, but lets be safe + params['baserevid'] = claim.on_item.lastrevid + if bot: + params['bot'] = 1 + if not new and hasattr(qualifier, 'hash'): + params['snakhash'] = qualifier.hash + params['token'] = self.token(claim, 'edit') + #build up the snak + if qualifier.getSnakType() == 'value': + params['value'] = json.dumps(qualifier._formatDataValue()) + params['snaktype'] = qualifier.getSnakType() + params['property'] = qualifier.getID() + + for arg in kwargs: + if arg in ['baserevid', 'summary']: + params[arg] = kwargs[arg] + + req = api.Request(site=self, **params) + data = req.submit() + return data + + @must_be(group='user') def removeClaims(self, claims, bot=True, **kwargs): params = dict(action='wbremoveclaims') if bot: -- To view, visit https://gerrit.wikimedia.org/r/81567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I917a69fff552be8b29a5d186d6b9f8df6eeea61d Gerrit-PatchSet: 9 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: FelixReimann <felix(a)fex-it.de> Gerrit-Reviewer: FelixReimann <felix(a)fex-it.de> 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Use the API to retrieve redirects to the category redirect t... - change (pywikibot/core)
by jenkins-bot (Code Review) 04 Oct '13

04 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: Use the API to retrieve redirects to the category redirect template (this time with caching) ...................................................................... Use the API to retrieve redirects to the category redirect template (this time with caching) Change-Id: I7af283b3b7a18bd713627cb5f1d8667773e3f3c6 --- M pywikibot/families/wikipedia_family.py M pywikibot/family.py 2 files changed, 24 insertions(+), 10 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 0149a8e..67f3fd4 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -54,11 +54,7 @@ 'arz': (u'تحويل تصنيف',), 'cs': (u'Zastaralá kategorie',), 'da': (u'Kategoriomdirigering',), - 'en': (u'Category redirect', - u'Category Redirect', - u"Categoryredirect", - u'Catredirect', - u'Cat redirect',), + 'en': (u'Category redirect',), 'es': (u'Categoría redirigida',), 'eu': (u'Kategoria redirect',), 'fa': (u'رده بهتر', diff --git a/pywikibot/family.py b/pywikibot/family.py index 59484c9..a7c58d4 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -653,7 +653,6 @@ } # A list of category redirect template names in different languages - # Note: It *is* necessary to list template redirects here self.category_redirect_templates = { '_default': [] } @@ -858,15 +857,34 @@ % {'language_code': code}) def category_redirects(self, code, fallback="_default"): - if code in self.category_redirect_templates: - return self.category_redirect_templates[code] - elif fallback: - return self.category_redirect_templates[fallback] + if not hasattr(self, "_catredirtemplates") or code not in self._catredirtemplates: + self.get_cr_templates(code, fallback) + if code in self._catredirtemplates: + return self._catredirtemplates[code] else: raise KeyError( "ERROR: title for category redirect template in language '%s' unknown" % code) + def get_cr_templates(self, code, fallback): + if not hasattr(self, "_catredirtemplates"): + self._catredirtemplates = {} + if code in self.category_redirect_templates: + cr_template = self.category_redirect_templates[code][0] + else: + cr_template = self.category_redirect_templates[fallback][0] + # start with list of category redirect templates from family file + cr_page = pywikibot.Page(pywikibot.Site(code, self), + "Template:" + cr_template) + cr_list = list(self.category_redirect_templates[code]) + # retrieve all redirects to primary template from API, + # add any that are not already on the list + for t in cr_page.backlinks(filterRedirects=True, namespaces=10): + newtitle = t.title(withNamespace=False) + if newtitle not in cr_list: + cr_list.append(newtitle) + self._catredirtemplates[code] = cr_list + def disambig(self, code, fallback='_default'): if code in self.disambiguationTemplates: return self.disambiguationTemplates[code] -- To view, visit https://gerrit.wikimedia.org/r/85203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7af283b3b7a18bd713627cb5f1d8667773e3f3c6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Russell Blau <russblau(a)imapmail.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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] tests: Use unittest2 on python 2.6 - change (pywikibot/core)
by jenkins-bot (Code Review) 03 Oct '13

03 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: tests: Use unittest2 on python 2.6 ...................................................................... tests: Use unittest2 on python 2.6 unittest2 is a backport of python 2.7s unittest features to 2.6. Use it when running the tests that already use those features. Change-Id: I5332e9e0815475d4bb4147bb5c1ef0d0ddc5c3bd --- M setup.py M tests/api_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/i18n_tests.py M tests/page_tests.py M tests/pwb_tests.py M tests/site_tests.py M tests/textlib_tests.py M tests/ui_tests.py M tests/utils.py M tests/wikibase_tests.py 12 files changed, 61 insertions(+), 32 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index a38cfe8..b022d2f 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,17 @@ from setuptools import setup, find_packages from setuptools.command import install +test_deps = [] + if sys.version_info[0] != 2: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") elif sys.version_info[1] < 6: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") +elif sys.version_info[1] == 6: + test_deps = ['unittest2'] + testcollector = "tests.utils.collector" +else: + testcollector = "tests" class pwb_install(install.install): @@ -47,7 +54,8 @@ dependency_links=[ 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format=gz…' ], - test_suite="tests", + test_suite=testcollector, + tests_require=test_deps, classifiers=[ 'License :: OSI Approved :: MIT License', 'Development Status :: 4 - Beta' diff --git a/tests/api_tests.py b/tests/api_tests.py index 7c21ff0..4437036 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -9,8 +9,7 @@ import datetime import pywikibot import pywikibot.data.api as api -import unittest -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest mysite = pywikibot.Site('en', 'wikipedia') diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index cc18083..82437af 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,11 +1,11 @@ -import datetime -import pywikibot -from pywikibot.data.api import CachedRequest -import unittest - - -class DryAPITests(unittest.TestCase): - +import datetime +import pywikibot +from pywikibot.data.api import CachedRequest +from utils import unittest + + +class DryAPITests(unittest.TestCase): + def setUp(self): self.parms = {'site': pywikibot.Site('en'), 'action': 'query', diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index 8847345..61b6452 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -1,8 +1,9 @@ -import pywikibot -import unittest - - -class DrySite(pywikibot.site.APISite): +import pywikibot + +from utils import unittest + + +class DrySite(pywikibot.site.APISite): @property def userinfo(self): return self._userinfo diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 8bef1e6..104f308 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -6,11 +6,12 @@ # __version__ = '$Id$' -import unittest import os from pywikibot import i18n import shutil +from utils import unittest + class TestTranslate(unittest.TestCase): def setUp(self): diff --git a/tests/page_tests.py b/tests/page_tests.py index 5a60678..d764f68 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' -import unittest import pywikibot import pywikibot.page -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index bd30b33..51db60b 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -9,15 +9,18 @@ import os import sys import subprocess - -import unittest - import pywikibot + +from utils import unittest pypath = sys.executable basepath = os.path.split(os.path.split(__file__)[0])[0] pwbpath = os.path.join(basepath, 'pwb.py') testbasepath = os.path.join(basepath, 'tests', 'pwb') + + +def check_output(command): + return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0] class TestPwb(unittest.TestCase): @@ -35,8 +38,8 @@ the environment we get when directly running a script.""" test = os.path.join(testbasepath, 'print_locals.py') - direct = subprocess.check_output([pypath, test]) - vpwb = subprocess.check_output([pypath, pwbpath, test]) + direct = check_output([pypath, test]) + vpwb = check_output([pypath, pwbpath, test]) self.assertEqual(direct, vpwb) if __name__ == "__main__": diff --git a/tests/site_tests.py b/tests/site_tests.py index 3958601..a3f6d81 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' -import unittest import pywikibot import warnings from tests import patch_request, unpatch_request -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest mysite = None mainpage = None @@ -35,7 +34,6 @@ def testBaseMethods(self): """Test cases for BaseSite methods""" - self.assertEqual(mysite.family.name, self.family) self.assertEqual(mysite.code, self.code) self.assertType(mysite.lang, basestring) diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 3f504c0..52aa8e2 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -10,13 +10,14 @@ import mwparserfromhell except ImportError: mwparserfromhell = False -import unittest import codecs import os import pywikibot import pywikibot.textlib as textlib +from utils import unittest + files = {} dirname = os.path.join(os.path.dirname(__file__), "pages") diff --git a/tests/ui_tests.py b/tests/ui_tests.py index d4ba066..2f01410 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -9,13 +9,14 @@ # __version__ = '$Id$' -import unittest import cStringIO import StringIO import logging import os import sys +from utils import unittest + if os.name == "nt": from multiprocessing.managers import BaseManager import threading diff --git a/tests/utils.py b/tests/utils.py index adb31b7..bccf715 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,23 @@ -import unittest +try: + # Unittest2 is a backport of python 2.7s unittest module to python 2.6 + # Trying to import unittest2 has to happen first because 2.6 does have a + # unittest module in the standard library but that doesn't support all the + # features of the one found in python 2.7, so importing unittest first and + # then trying to figure out if it supports the features used would mean + # checking the module contents etc. Just catching an ImportError once is + # much easier. + import unittest2 as unittest +except ImportError: + import unittest + + +def collector(): + # This test collector loads tests from the `tests` directory in files + # matching the pattern `*tests.py`. This gets used by `setup.py test` when + # running on Python 2.6 to use the unittest2 test runner instead of the + # unittest one. + return unittest.loader.defaultTestLoader.discover("tests", "*tests.py") + from tests import patch_request, unpatch_request diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index ef39990..eb653d8 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' import os -import unittest import pywikibot import json -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) -- To view, visit https://gerrit.wikimedia.org/r/86436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5332e9e0815475d4bb4147bb5c1ef0d0ddc5c3bd Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(a)gmail.com> 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

1 0

[Gerrit] Aligned help with implementation - change (pywikibot/core)
by jenkins-bot (Code Review) 02 Oct '13

02 Oct '13

jenkins-bot has submitted this change and it was merged. Change subject: Aligned help with implementation ...................................................................... Aligned help with implementation Change-Id: I32340b0ed4e6bf39a793ccb6b7288c02ed1b941c --- M pywikibot/config2.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index ee62581..1085ddc 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -105,7 +105,8 @@ provided in this argument 2. If the user has a PYWIKIBOT2_DIR environment variable, use the value of it - 3. Use (and if necessary create) a 'pywikibot' folder (Windows) or + 3. Use (and if necessary create) a 'pywikibot' folder under + 'Application Data' or 'AppData\Roaming' (Windows) or '.pywikibot' directory (Unix and similar) under the user's home directory. -- To view, visit https://gerrit.wikimedia.org/r/87016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32340b0ed4e6bf39a793ccb6b7288c02ed1b941c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits