John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151426
Change subject: Remaining flakes in pywikibot/
......................................................................
Remaining flakes in pywikibot/
Add __all__ to __init__.py to define the list of exported
symbols.
Change-Id: I40a0f4d389cc039a371ec51d5ef05f96f84e1889
---
M pywikibot/__init__.py
M pywikibot/botirc.py
M pywikibot/textlib.py
M pywikibot/version.py
M pywikibot/weblib.py
M scripts/replicate_wiki.py
6 files changed, 62 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/26/151426/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index fb452c7..b434615 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -12,7 +12,6 @@
import datetime
import difflib
-import logging
import math
import re
import sys
@@ -28,10 +27,55 @@
# who want to continue using both
from pywikibot import config2 as config
-from pywikibot.bot import *
-from pywikibot.exceptions import *
-from pywikibot.textlib import *
+from pywikibot.bot import (
+ output, warning, error, critical, debug, stdout, exception,
+ input, inputChoice, handleArgs, showHelp, ui, log,
+ calledModuleName, Bot, WikidataBot,
+)
+from pywikibot.exceptions import (
+ Error, InvalidTitle, BadTitle, NoPage, SectionError,
+ NoSuchSite, NoUsername, UserBlocked,
+ PageRelatedError, IsRedirectPage, IsNotRedirectPage,
+ PageNotSaved, UploadWarning, LockedPage, EditConflict,
+ ServerError, FatalServerError, Server504Error,
+ CaptchaError, SpamfilterError, CircularRedirect,
+ WikiBaseError, CoordinateGlobeUnknownException,
+)
+from pywikibot.textlib import (
+ unescape, replaceExcept, removeDisabledParts, removeHTMLParts,
+ isDisabled, interwikiFormat, interwikiSort,
+ getLanguageLinks, replaceLanguageLinks,
+ removeLanguageLinks, removeLanguageLinksAndSeparator,
+ getCategoryLinks, categoryFormat, replaceCategoryLinks,
+ removeCategoryLinks, removeCategoryLinksAndSeparator,
+ replaceCategoryInPlace, compileLinkR, extract_templates_and_params,
+)
+from pywikibot.tools import UnicodeMixin
from pywikibot.i18n import translate
+
+__all__ = [
+ 'config', 'ui', 'UnicodeMixin', 'translate',
+ 'Page', 'ImagePage', 'Category', 'Link', 'User',
+ 'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
+ 'html2unicode', 'url2unicode', 'unicode2html',
+ 'stdout', 'output', 'warning', 'error', 'critical', 'debug', 'exception',
+ 'input', 'inputChoice', 'handleArgs', 'showHelp', 'ui', 'log',
+ 'calledModuleName', 'Bot', 'WikidataBot',
+ 'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError',
+ 'NoSuchSite', 'NoUsername', 'UserBlocked',
+ 'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage',
+ 'PageNotSaved', 'UploadWarning', 'LockedPage', 'EditConflict',
+ 'ServerError', 'FatalServerError', 'Server504Error',
+ 'CaptchaError', 'SpamfilterError', 'CircularRedirect',
+ 'WikiBaseError', 'CoordinateGlobeUnknownException',
+ 'unescape', 'replaceExcept', 'removeDisabledParts', 'removeHTMLParts',
+ 'isDisabled', 'interwikiFormat', 'interwikiSort',
+ 'getLanguageLinks', 'replaceLanguageLinks',
+ 'removeLanguageLinks', 'removeLanguageLinksAndSeparator',
+ 'getCategoryLinks', 'categoryFormat', 'replaceCategoryLinks',
+ 'removeCategoryLinks', 'removeCategoryLinksAndSeparator',
+ 'replaceCategoryInPlace', 'compileLinkR', 'extract_templates_and_params',
+]
class Timestamp(datetime.datetime):
@@ -416,16 +460,16 @@
if old_arg in __kw:
if new_arg:
if new_arg in __kw:
- pywikibot.warning(
+ warning(
u"%(new_arg)s argument of %(meth_name)s replaces %(old_arg)s; cannot use both."
% locals())
else:
- pywikibot.warning(
+ warning(
u"%(old_arg)s argument of %(meth_name)s is deprecated; use %(new_arg)s
instead."
% locals())
__kw[new_arg] = __kw[old_arg]
else:
- pywikibot.debug(
+ debug(
u"%(old_arg)s argument of %(meth_name)s is deprecated."
% locals(), _logger)
del __kw[old_arg]
@@ -481,7 +525,7 @@
key = '%s:%s:%s' % (fam, code, user)
if key not in _sites or not isinstance(_sites[key], __Site):
_sites[key] = __Site(code=code, fam=fam, user=user, sysop=sysop)
- pywikibot.debug(u"Instantiating Site object '%(site)s'"
+ debug(u"Instantiating Site object '%(site)s'"
% {'site': _sites[key]}, _logger)
return _sites[key]
@@ -581,7 +625,7 @@
_logger = "wiki"
if not stopped:
- pywikibot.debug(u"stopme() called", _logger)
+ debug(u"stopme() called", _logger)
def remaining():
remainingPages = page_put_queue.qsize() - 1
@@ -616,7 +660,7 @@
# only need one drop() call because all throttles use the same global pid
try:
list(_sites.values())[0].throttle.drop()
- pywikibot.log(u"Dropped throttle(s).")
+ log(u"Dropped throttle(s).")
except IndexError:
pass
diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py
index ee08540..f2138d3 100644
--- a/pywikibot/botirc.py
+++ b/pywikibot/botirc.py
@@ -18,21 +18,11 @@
# scripts, instead of writing each one from scratch.
-import logging.handlers
-# all output goes thru python std library "logging" module
-
import re
from ircbot import SingleServerIRCBot
-from irclib import nm_to_n
_logger = "botirc"
-
-# logging levels
-from logging import DEBUG, INFO, WARNING, ERROR, CRITICAL
-STDOUT = 16
-VERBOSE = 18
-INPUT = 25
import pywikibot
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 2e875fb..92d62d5 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -610,7 +610,7 @@
link = title.replace('[[:', '[[')
s.append(link)
except AttributeError:
- s.append(getSite(site).linkto(links[site], othersite=insite))
+ s.append(pywikibot.Site(code=site).linkto(links[site],
othersite=insite))
if insite.lang in insite.family.interwiki_on_one_line:
sep = u' '
else:
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 26bc0dc..0377614 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -203,7 +203,7 @@
"""
_program_dir = _get_program_dir()
__version__ = None
- size, mtime = None, None
+ mtime = None
fn = os.path.join(_program_dir, filename)
if os.path.exists(fn):
for line in open(fn, 'r').readlines():
diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py
index 11054dd..017965a 100644
--- a/pywikibot/weblib.py
+++ b/pywikibot/weblib.py
@@ -60,7 +60,7 @@
query = {'returnxml': 'true',
'url': url}
- if not timestamp is None:
+ if timestamp is not None:
query['date'] = timestamp
uri = uri + urllib.urlencode(query)
diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py
index a7defbc..113ab8f 100644
--- a/scripts/replicate_wiki.py
+++ b/scripts/replicate_wiki.py
@@ -31,8 +31,10 @@
#
import sys
-from pywikibot import *
from itertools import imap
+
+import pywikibot
+from pywikibot import config, Page
def namespaces(site):
@@ -67,7 +69,7 @@
sites = options.destination_wiki
- self.original = Site(original_wiki, family)
+ self.original = pywikibot.Site(original_wiki, family)
self.original.login()
if options.namespace and 'help' in options.namespace:
@@ -76,7 +78,7 @@
pywikibot.output('%s %s' % (k, nsd[k]))
sys.exit()
- self.sites = map(lambda s: Site(s, family), sites)
+ self.sites = map(lambda s: pywikibot.Site(s, family), sites)
self.differences = {}
self.user_diff = {}
--
To view, visit https://gerrit.wikimedia.org/r/151426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40a0f4d389cc039a371ec51d5ef05f96f84e1889
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jay...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
