jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/697437 )
Change subject: [tests] Do not call pywikibot.Site() if aspects.DisableSiteMixin is used
......................................................................
[tests] Do not call pywikibot.Site() if aspects.DisableSiteMixin is used
Bug: T284018
Change-Id: I291100ec2f6a552e0f1c4f793e28dd8290bf1d97
---
M pywikibot/bot.py
M tests/aspects.py
2 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 216b39d..47422ae 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -349,10 +349,13 @@
# if user has enabled file logging, configure file handler
if module_name in config.log or '*' in config.log:
- # get PID
- throttle = pywikibot.Site().throttle # initialize a Throttle object
- pid = throttle.get_pid(module_name) # get the global PID if needed
- pid = str(pid) + '-' if pid > 1 else ''
+ if pywikibot.Site.__doc__ == 'TEST': # set by aspects.DisableSiteMixin
+ pid = ''
+ else:
+ # get PID
+ throttle = pywikibot.Site().throttle # initialize a Throttle obj
+ pid = throttle.get_pid(module_name) # get the global PID if needed
+ pid = str(pid) + '-' if pid > 1 else ''
if config.logfilename:
# keep config.logfilename unchanged
diff --git a/tests/aspects.py b/tests/aspects.py
index f9da3cc..4c819fb 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -327,6 +327,7 @@
self.old_Site_lookup_method = pywikibot.Site
pywikibot.Site = lambda *args: self.fail(
'{}: Site() not permitted'.format(self.__class__.__name__))
+ pywikibot.Site.__doc__ = 'TEST'
super().setUp()
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/697437
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I291100ec2f6a552e0f1c4f793e28dd8290bf1d97
Gerrit-Change-Number: 697437
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673836 )
Change subject: [doc] convert epytext docstrings to sphinx format
......................................................................
[doc] convert epytext docstrings to sphinx format
The conversion was made by a modified pywikibot_epytext_to_sphinx
function docs/conf.py
Bug: T278046
Change-Id: Ied73d3eb2367ec59747f0bc890d1c6640f4b278e
---
M generate_family_file.py
M generate_user_files.py
M pwb.py
M pywikibot/__init__.py
M pywikibot/bot.py
M pywikibot/bot_choice.py
M pywikibot/comms/eventstreams.py
M pywikibot/comms/http.py
M pywikibot/config.py
M pywikibot/cosmetic_changes.py
M pywikibot/daemonize.py
M pywikibot/data/api.py
M pywikibot/data/mysql.py
M pywikibot/data/sparql.py
M pywikibot/data/wikistats.py
M pywikibot/date.py
M pywikibot/diff.py
M pywikibot/echo.py
M pywikibot/editor.py
M pywikibot/exceptions.py
M pywikibot/families/wikiquote_family.py
M pywikibot/family.py
M pywikibot/flow.py
M pywikibot/i18n.py
M pywikibot/interwiki_graph.py
M pywikibot/logentries.py
M pywikibot/logging.py
M pywikibot/login.py
M pywikibot/page/__init__.py
M pywikibot/page/_collections.py
M pywikibot/page/_revision.py
M pywikibot/pagegenerators.py
M pywikibot/proofreadpage.py
M pywikibot/site/_apisite.py
M pywikibot/site/_basesite.py
M pywikibot/site/_datasite.py
M pywikibot/site/_decorators.py
M pywikibot/site/_extensions.py
M pywikibot/site/_generators.py
M pywikibot/site/_interwikimap.py
M pywikibot/site/_namespace.py
M pywikibot/site/_siteinfo.py
M pywikibot/site/_tokenwallet.py
M pywikibot/site_detect.py
M pywikibot/specialbots/_upload.py
M pywikibot/textlib.py
M pywikibot/throttle.py
M pywikibot/tools/__init__.py
M pywikibot/tools/chars.py
M pywikibot/tools/djvu.py
M pywikibot/tools/formatter.py
M pywikibot/userinterfaces/gui.py
M pywikibot/userinterfaces/terminal_interface_base.py
M pywikibot/userinterfaces/transliteration.py
M pywikibot/userinterfaces/win32_unicode.py
M pywikibot/version.py
M pywikibot/xmlreader.py
M scripts/add_text.py
M scripts/archive/blockpageschecker.py
M scripts/archive/capitalize_redirects.py
M scripts/archive/catall.py
M scripts/archive/commons_link.py
M scripts/archive/create_categories.py
M scripts/archive/data_ingestion.py
M scripts/archive/disambredir.py
M scripts/archive/editarticle.py
M scripts/archive/flickrripper.py
M scripts/archive/followlive.py
M scripts/archive/freebasemappingupload.py
M scripts/archive/imagecopy.py
M scripts/archive/imagecopy_self.py
M scripts/archive/imagerecat.py
M scripts/archive/imageuncat.py
M scripts/archive/isbn.py
M scripts/archive/lonelypages.py
M scripts/archive/makecat.py
M scripts/archive/ndashredir.py
M scripts/archive/piper.py
M scripts/archive/selflink.py
M scripts/archive/spamremove.py
M scripts/archive/states_redirect.py
M scripts/archive/surnames_redirects.py
M scripts/archive/table2wiki.py
M scripts/archive/unlink.py
M scripts/archive/wikisourcetext.py
M scripts/archivebot.py
M scripts/basic.py
M scripts/category.py
M scripts/category_redirect.py
M scripts/change_pagelang.py
M scripts/checkimages.py
M scripts/claimit.py
M scripts/clean_sandbox.py
M scripts/commons_information.py
M scripts/commonscat.py
M scripts/coordinate_import.py
M scripts/cosmetic_changes.py
M scripts/delete.py
M scripts/djvutext.py
M scripts/download_dump.py
M scripts/fixing_redirects.py
M scripts/harvest_template.py
M scripts/illustrate_wikidata.py
M scripts/image.py
M scripts/imagetransfer.py
M scripts/interwiki.py
M scripts/interwikidata.py
M scripts/listpages.py
M scripts/login.py
M scripts/maintenance/cache.py
M scripts/maintenance/make_i18n_dict.py
M scripts/misspelling.py
M scripts/movepages.py
M scripts/newitem.py
M scripts/noreferences.py
M scripts/nowcommons.py
M scripts/pagefromfile.py
M scripts/patrol.py
M scripts/protect.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/revertbot.py
M scripts/solve_disambiguation.py
M scripts/speedy_delete.py
M scripts/template.py
M scripts/templatecount.py
M scripts/touch.py
M scripts/transferbot.py
M scripts/unusedfiles.py
M scripts/upload.py
M scripts/watchlist.py
M scripts/weblinkchecker.py
M scripts/welcome.py
M setup.py
M tests/aspects.py
M tests/bot_tests.py
M tests/deprecation_tests.py
M tests/link_tests.py
M tests/page_tests.py
M tests/pagegenerators_tests.py
M tests/replacebot_tests.py
M tests/site_detect_tests.py
M tests/textlib_tests.py
M tests/tools_formatter_tests.py
M tests/ui_tests.py
M tests/uploadscript_tests.py
M tests/utils.py
M tests/wikibase_edit_tests.py
150 files changed, 3,888 insertions(+), 3,869 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/673836
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ied73d3eb2367ec59747f0bc890d1c6640f4b278e
Gerrit-Change-Number: 673836
Gerrit-PatchSet: 17
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Damian <atagar1(a)gmail.com>
Gerrit-Reviewer: Huji <huji.huji(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged