jenkins-bot has submitted this change and it was merged.

Change subject: update package name and links to documentation on MediaWiki.org ......................................................................

update package name and links to documentation on MediaWiki.org

using HTTPS/Special:MyLanguage for security/i18n purposes; also fixed some typos

Change-Id: I244b45c6b86853f477b0965bec63391e9a75645a --- M .gitignore M README.rst M generate_user_files.py M pwb.py M pywikibot/comms/http.py M pywikibot/config2.py M pywikibot/data/wikidataquery.py M pywikibot/epydoc.cfg M pywikibot/textlib.py M pywikibot/version.py M scripts/checkimages.py M scripts/template.py M scripts/version.py M scripts/welcome.py M setup.py 15 files changed, 31 insertions(+), 31 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/.gitignore b/.gitignore index 90d2199..72bcafa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ logs* *cache* .idea -Pywikipediabot.egg-info/ +pywikibot.egg-info/ diff --git a/README.rst b/README.rst index e19cdc5..0d2a900 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ ===================

The pywikibot framework is a Python library that interfaces with the -`MediaWiki API https://www.mediawiki.org/wiki/API`_. Also included are +`MediaWiki API https://www.mediawiki.org/wiki/Special:MyLanguage/API:Main_page`_. Also included are various general function scripts that can be adapted for different tasks.

@@ -17,7 +17,7 @@ python pwb.py script_name

Our `installation -guide https://www.mediawiki.org/wiki/Manual:Pywikipediabot/Installation`_ +guide https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Pywikibot/Installation`_ has more details for advanced usage.

Usage @@ -37,7 +37,7 @@ ------------

Our code is maintained on Wikimedia's `Gerrit installation https://gerrit.wikimedia.org/`_, -`learn https://www.mediawiki.org/wiki/Developer_access`_ how to get +`learn https://www.mediawiki.org/wiki/Special:MyLanguage/Developer_access`_ how to get started.

.. image:: https://secure.travis-ci.org/wikimedia/pywikibot-core.png?branch=master diff --git a/generate_user_files.py b/generate_user_files.py index 3f7fba5..c9cefb1 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -333,7 +333,7 @@ if os.path.exists(os.path.join(base_dir, "user-config.py")): break do_copy = raw_input("Do you want to copy user files from an existing " - "pywikipedia installation? ").upper().strip() + "pywikibot installation? ").upper().strip() if do_copy and "YES".startswith(do_copy): oldpath = raw_input("Path to existing wikipedia.py? ") if not os.path.exists(oldpath): diff --git a/pwb.py b/pwb.py index 14178a8..2fba1d3 100644 --- a/pwb.py +++ b/pwb.py @@ -84,7 +84,7 @@ "or higher") else: if sys.version_info[0] not in (2, 3): - raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2 " + raise RuntimeError("ERROR: Pywikibot only runs under Python 2 " "or Python 3") version = tuple(sys.version_info)[:3] if version < (2, 6, 5): diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index fc2dcea..affc571 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -13,7 +13,7 @@ """

# -# (C) Pywikipedia bot team, 2007-2014 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # @@ -55,9 +55,9 @@ SSL_CERT_VERIFY_FAILED = ":14090086:"

# the User-agent: header. The default is -# '<script>/<revision> Pywikipediabot/2.0', where '<script>' is the currently -# executing script and version is the SVN revision of Pywikipediabot. -USER_AGENT_FORMAT = '{script}/r{version[rev]} Pywikipediabot/2.0' +# '<script>/<revision> Pywikibot/2.0', where '<script>' is the currently +# executing script and version is the Git revision of Pywikibot. +USER_AGENT_FORMAT = '{script}/r{version[rev]} Pywikibot/2.0' useragent = USER_AGENT_FORMAT.format(script=pywikibot.calledModuleName(), version=pywikibot.version.getversiondict()) numthreads = 1 diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 24966b3..757905f 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -196,7 +196,7 @@ try: console_encoding = __sys.stdout.encoding except: - # When using pywikipedia inside a daemonized twisted application, + # When using pywikibot inside a daemonized twisted application, # we get "StdioOnnaStick instance has no attribute 'encoding'" console_encoding = None

@@ -738,7 +738,7 @@ print("WARNING: Running on Windows and transliteration_target is not " "set.") print("Please see " - "http://www.mediawiki.org/wiki/Manual:Pywikipediabot/Windows") + "https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Pywikibot/Windows") else: transliteration_target = None elif transliteration_target in ('None', 'none'): diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py index 12e5d35..c606a18 100644 --- a/pywikibot/data/wikidataquery.py +++ b/pywikibot/data/wikidataquery.py @@ -3,7 +3,7 @@ Objects representing WikidataQuery query syntax and API """ # -# (C) Pywikipedia bot team, 2013 +# (C) Pywikibot team, 2013 # # Distributed under the terms of the MIT license.

@@ -396,7 +396,7 @@

class WikidataQuery(): """ - An interface to the WikidatQuery API. Default host is + An interface to the WikidataQuery API. Default host is http://wdq.wmflabs.org, but you can substitute a different one.

@@ -423,7 +423,7 @@ def getQueryString(self, q, labels=[], props=[]): """ Get the query string for a given query or queryset - @return query string including lables and props + @return query string including labels and props """ qStr = "q=%s" % quote(str(q))

diff --git a/pywikibot/epydoc.cfg b/pywikibot/epydoc.cfg index 7ada205..8dbe58f 100644 --- a/pywikibot/epydoc.cfg +++ b/pywikibot/epydoc.cfg @@ -26,7 +26,7 @@

# url # The documented project's URL. -url: http://pywikipediabot.sourceforge.net +url: https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Pywikibot

# frames # Whether or not to include a frames-based table of contents. diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 410af7b..70839ac 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1163,7 +1163,7 @@

class TimeStripper(object): """ - Find timetstamp in page text and returns it as timezone aware datetime object + Find timestamp in page text and returns it as timezone aware datetime object """

def __init__(self, site=None): diff --git a/pywikibot/version.py b/pywikibot/version.py index d2be01d..6d0d30d 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -""" Module to determine the pywikipedia version (tag, revision and date) """ +""" Module to determine the pywikibot version (tag, revision and date) """ # # (C) Merlijn 'valhallasw' van Deen, 2007-2014 # (C) xqt, 2010-2014 diff --git a/scripts/checkimages.py b/scripts/checkimages.py index c26f4e4..64a90d5 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -6,7 +6,7 @@ description.

This script will have to be configured for each language. Please submit -translations as addition to the pywikipediabot framework. +translations as addition to the pywikibot framework.

Everything that needs customisation is indicated by comments.

@@ -84,7 +84,7 @@ # (C) Kyle/Orgullomoore, 2006-2007 (newimage.py) # (C) Siebrand Mazeland, 2007-2010 # (C) Filnik, 2007-2011 -# (C) Pywikipedia team, 2007-2014 +# (C) Pywikibot team, 2007-2014 # # Distributed under the terms of the MIT license. # diff --git a/scripts/template.py b/scripts/template.py index 2298759..eda65eb 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -69,12 +69,12 @@

python template.py test -subst -namespace:2 -namespace:3

-Note that -namespace: is a global pywikipedia parameter +Note that -namespace: is a global pywikibot parameter

This next example substitutes the template lived with a supplied edit summary. It only performs substitutions in main article namespace and doesn't prompt to -start replacing. Note that -putthrottle: is a global pywikipedia parameter. +start replacing. Note that -putthrottle: is a global pywikibot parameter.

python template.py -putthrottle:30 -namespace:0 lived -subst -always -summary:"BOT: Substituting {{lived}}, see [[WP:SUBST]]." diff --git a/scripts/version.py b/scripts/version.py index 24c8327..f341332 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -""" Script to determine the pywikipedia version (tag, revision and date) """ +""" Script to determine the pywikibot version (tag, revision and date) """ # # (C) Merlijn 'valhallasw' van Deen, 2007-2008 # (C) xqt, 2010-2014 diff --git a/scripts/welcome.py b/scripts/welcome.py index 0b91f6e..4ee4bc8 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -109,9 +109,9 @@ * dio is a badword * Claudio is a normal name * The username is "Claudio90 fuck!" - * The Bot find dio and set "warning" - * The Bot find Claudio and set "ok" - * The Bot find fuck at the end and set "warning" + * The Bot finds dio and sets "warning" + * The Bot finds Claudio and sets "ok" + * The Bot finds fuck at the end and sets "warning" * Result: The username is reported. 4) When a user is reported you have to check him and do: * If he's ok, put the {{welcome}} @@ -174,7 +174,7 @@ # (C) Daniel Herding, 2007 # (C) Alex Shih-Han Lin, 2009-2010 # (C) xqt, 2009-2011 -# (C) Pywikipedia bot team, 2008-2010 +# (C) Pywikibot team, 2008-2010 # # Distributed under the terms of the MIT license. # @@ -942,7 +942,7 @@ elif arg == '-quick': globalvar.quick = True

- # Filename and pywikipedia path + # Filename and pywikibot path # file where is stored the random signature index filename = pywikibot.config.datafilepath('welcome-%s-%s.data' % (pywikibot.Site().family.name, diff --git a/setup.py b/setup.py index 207fa25..5752e0b 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@

if sys.version_info[0] == 2: if sys.version_info < (2, 6, 5): - raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6.5 or higher") + raise RuntimeError("ERROR: Pywikibot only runs under Python 2.6.5 or higher") elif sys.version_info[1] == 6: test_deps = ['unittest2'] testcollector = "tests.utils.collector" @@ -32,7 +32,7 @@ if sys.version_info[0] == 3: if not os.environ.get('PY3', False): # use setup.py test --python3ok to run tests - print("ERROR: Pywikipediabot only runs under Python 2") + print("ERROR: Pywikibot only runs under Python 2") sys.exit(1) if sys.version_info[1] < 3: print("ERROR: Python 3.3 or higher is required!") @@ -56,7 +56,7 @@ setup( name='pywikibot', version='2.0b1', - description='Python Wikipedia Bot Framework', + description='Python MediaWiki Bot Framework', long_description=open('README.rst').read(), maintainer='The pywikibot team', maintainer_email='pywikipedia-l@lists.wikimedia.org',