Merge branch 'tests' into T322212

Bug: T322212
Change-Id: I7e220a350679bf4ca816e5c37821426494bd4a5b
---
M pywikibot/textlib.py
M docs/make.bat
M ROADMAP.rst
M docs/mwapi.rst
M docs/recipes.rst
M docs/utilities/scripts.rst
M docs/index.rst
M docs/scripts_ref/scripts.maintenance.rst
M docs/tests_ref/index.rst
M docs/api_ref/index.rst
M docs/utilities/scripts_ref.rst
M docs/installation.rst
M docs/scripts/index.rst
M HISTORY.rst
M docs/introduction.rst
M docs/scripts_ref/index.rst
M docs/scripts_ref/scripts.i18n.rst
M docs/utilities/install.rst
M docs/scripts_ref/scripts.rst
M docs/faq.rst
M docs/scripts_ref/scripts.userscripts.rst
22 files changed, 36 insertions(+), 167 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 88b1822..694c539 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,14 +1,11 @@
 Release history
 ===============
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
 
 7.7.2
 -----
 *03 December 2022*
 
 * Fix :class:`textlib.TimeStripper` for ``vi`` site code (:phab:`T324310`)
-=======
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 7.7.1
 -----
diff --git a/ROADMAP.rst b/ROADMAP.rst
index d2f1e69..609c6ff 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -79,12 +79,9 @@
 * 6.2.0: Throttle.multiplydelay attribute is deprecated
 * 6.2.0: SequenceOutputter.format_list() is deprecated in favour of 'out' property
 * 6.0.0: config.register_family_file() is deprecated
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-=======
 
 
 Will be removed in Pywikibot 8
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
->>>>>>> BRANCH (77cbd3 Update git submodules)
 * 5.5.0: APISite.redirectRegex() will be removed in favour of APISite.redirect_regex()
diff --git a/docs/api_ref/index.rst b/docs/api_ref/index.rst
index ffd4a74..5db1b21 100644
--- a/docs/api_ref/index.rst
+++ b/docs/api_ref/index.rst
@@ -15,14 +15,9 @@
 functions provided by :mod:`data.api`. This layer then uses :func:`comms.http.request`
 to do the actual HTTP request.
 
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Table of contents
-=================
-=======
 *****************
 Table of contents
 *****************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. toctree::
    :glob:
diff --git a/docs/faq.rst b/docs/faq.rst
index cd3aeef..c422292 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -1,11 +1,7 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Frequent asked questions
-========================
-=======
 **************************
 Frequently asked questions
 **************************
->>>>>>> BRANCH (77cbd3 Update git submodules)
+
 
 **How to speed up Pywikibot?**
   1. The first time you are using Pywikibot for multiple Wikimedia sites you
diff --git a/docs/index.rst b/docs/index.rst
index 474216e..a7b1802 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,15 +37,9 @@
 .. image:: framework.png
    :alt: Framework modules dependency network
 
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-
-Contents
---------
-=======
 ********
 Contents
 ********
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/installation.rst b/docs/installation.rst
index fcada23..bab9e27 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -1,9 +1,6 @@
 :orphan:
 
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-=======
 ************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 Installation
 ************
 
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 1087d51..b5dc1fb 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -31,11 +31,7 @@
 
 #. set the `userinterface_lang` in your :ref:`user-config.py<User Interface Settings>` to your preferred language
 #. set environment variable `PYWIKIBOT_USERINTERFACE_LANG` to your preferred language
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
 #. default is obtained from `locale.getlocale`
-=======
-#. default is obtained from `locale.getdefaultlocale`
->>>>>>> BRANCH (77cbd3 Update git submodules)
 #. fallback is `'en'` for English if all other options fails
 
 .. note:: The preferred language code must follow ISO 639.
diff --git a/docs/make.bat b/docs/make.bat
index 123c497..6726495 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -10,11 +10,7 @@
 set SOURCEDIR=.

 set BUILDDIR=_build

 set SPHINXPROJ=Pywikibot

-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-set SPHINXOPTS=%~2 %~3 %~4 %~5 %~6 %~7 %~8 %~9

-=======
 set SPHINXOPTS=-j auto

->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 if "%1" == "" goto help

 if "%1" == "help" goto help

diff --git a/docs/mwapi.rst b/docs/mwapi.rst
index b470052..7072057 100644
--- a/docs/mwapi.rst
+++ b/docs/mwapi.rst
@@ -3,18 +3,11 @@
 
    <br />
 
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-MediaWiki API cross reference
-=============================
-=======
 *****************************
 MediaWiki API cross reference
 *****************************
 
 See the table below for a cross reference between MediaWiki's API and Pywikibot's API.
->>>>>>> BRANCH (77cbd3 Update git submodules)
-
-See the table below for a cross reference between MediaWiki's API and Pywikibot's API.
 
 .. list-table::
    :header-rows: 1
diff --git a/docs/recipes.rst b/docs/recipes.rst
index 5cc46b3..bba2fdd 100644
--- a/docs/recipes.rst
+++ b/docs/recipes.rst
@@ -3,11 +3,7 @@
 *******
 
 How to modify a page
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
---------------------
-=======
 ====================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 >>> page = pywikibot.Page(pywikibot.Site(), 'Sample page')
 >>> new_content = page.text.replace('this', 'that')
@@ -16,11 +12,7 @@
 See :doc:`library_usage` for more advanced samples.
 
 How to get links from summary section of page
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
----------------------------------------------
-=======
 =============================================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 >>> import pywikibot
 >>> from pwikibot import textlib
diff --git a/docs/scripts/index.rst b/docs/scripts/index.rst
index a211f38..ba9751a 100644
--- a/docs/scripts/index.rst
+++ b/docs/scripts/index.rst
@@ -1,12 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-===============
-Scripts package
-===============
-=======
 ###############
 Scripts package
 ###############
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts
    :no-members:
@@ -16,14 +10,9 @@
    :start-after: included.
    :end-before: More precise
 
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Script descriptions
-===================
-=======
 *******************
 Script descriptions
 *******************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/scripts_ref/index.rst b/docs/scripts_ref/index.rst
index b28776e..0a582b3 100644
--- a/docs/scripts_ref/index.rst
+++ b/docs/scripts_ref/index.rst
@@ -1,11 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Scripts reference
------------------
-=======
 #################
 Scripts reference
 #################
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 Pywikibot framework has a lot of ready-to-use scripts for several tasks.
 In general the usage and options of all scripts may be shown by using the command
diff --git a/docs/scripts_ref/scripts.i18n.rst b/docs/scripts_ref/scripts.i18n.rst
index 83785ad..725eb11 100644
--- a/docs/scripts_ref/scripts.i18n.rst
+++ b/docs/scripts_ref/scripts.i18n.rst
@@ -1,10 +1,5 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Translation files - scripts.i18n
-================================
-=======
 ********************************
 Translation files - scripts.i18n
 ********************************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.i18n
diff --git a/docs/scripts_ref/scripts.maintenance.rst b/docs/scripts_ref/scripts.maintenance.rst
index ec5a808..4f2d4b6 100644
--- a/docs/scripts_ref/scripts.maintenance.rst
+++ b/docs/scripts_ref/scripts.maintenance.rst
@@ -1,65 +1,36 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Maintenance scripts
-===================
-=======
 *******************
 Maintenance scripts
 *******************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 This page contains documentation of the `scripts.maintenance` module:
 
 .. automodule:: scripts.maintenance
 
 Maintenance submodules
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-----------------------
-=======
 ======================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 scripts.maintenance.cache
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
---------------------------------
-=======
 -------------------------
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.maintenance.cache
    :ignore-module-all:
 
 scripts.maintenance.colors
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
----------------------------------
-=======
 --------------------------
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.maintenance.colors
 
 scripts.maintenance.make\_i18n\_dict
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
--------------------------------------------
-=======
 ------------------------------------
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.maintenance.make_i18n_dict
 
 scripts.maintenance.sorting\_order
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
------------------------------------------
-=======
 ----------------------------------
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.maintenance.sorting_order
 
 scripts.maintenance.wikimedia\_sites
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
--------------------------------------------
-=======
 ------------------------------------
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.maintenance.wikimedia_sites
diff --git a/docs/scripts_ref/scripts.rst b/docs/scripts_ref/scripts.rst
index b1704b8..4009f52 100644
--- a/docs/scripts_ref/scripts.rst
+++ b/docs/scripts_ref/scripts.rst
@@ -1,11 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Scripts package
-===============
-=======
 ***************
 Scripts package
 ***************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts
 
@@ -280,11 +275,7 @@
 .. automodule:: scripts.welcome
 
 Script subpackages
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-------------------
-=======
 ==================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 For information on contents of subpackages, see
 
diff --git a/docs/scripts_ref/scripts.userscripts.rst b/docs/scripts_ref/scripts.userscripts.rst
index 00b03c0..471e6df 100644
--- a/docs/scripts_ref/scripts.userscripts.rst
+++ b/docs/scripts_ref/scripts.userscripts.rst
@@ -1,10 +1,5 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-User scripts - scripts.userscripts
-==================================
-=======
 **********************************
 User scripts - scripts.userscripts
 **********************************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: scripts.userscripts
diff --git a/docs/tests_ref/index.rst b/docs/tests_ref/index.rst
index 684548f..b957ade 100644
--- a/docs/tests_ref/index.rst
+++ b/docs/tests_ref/index.rst
@@ -1,12 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-===============
-Tests reference
-===============
-=======
 ###############
 Tests reference
 ###############
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. include:: ../../tests/README.rst
 
diff --git a/docs/utilities/install.rst b/docs/utilities/install.rst
index 2e64037..ba13e72 100644
--- a/docs/utilities/install.rst
+++ b/docs/utilities/install.rst
@@ -1,11 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Installer scripts
-=================
-=======
 *****************
 Installer scripts
 *****************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 make\_dist script
 =================
diff --git a/docs/utilities/scripts.rst b/docs/utilities/scripts.rst
index 4b9112a..474bca9 100644
--- a/docs/utilities/scripts.rst
+++ b/docs/utilities/scripts.rst
@@ -1,88 +1,55 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Framework utility scripts
-=====================================
-=======
 *************************
 Framework utility scripts
 *************************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts
    :no-members:
    :noindex:
 
 pwb wrapper script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-------------------------------
-=======
 ==================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.wrapper
    :no-members:
    :noindex:
 
 generate\_family\_file script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
------------------------------------------
-=======
 =============================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.generate_family_file
    :no-members:
    :noindex:
 
 generate\_user\_files script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-----------------------------------------
-=======
 ============================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.generate_user_files
    :no-members:
    :noindex:
 
 login script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-------------------------
-=======
 ============
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.login
    :no-members:
    :noindex:
 
 preload_sites script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
---------------------------------
-=======
 ====================
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.preload_sites
    :no-members:
    :noindex:
 
 shell script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-------------------------
-=======
 ============
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.shell
    :no-members:
    :noindex:
 
 version script
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
---------------------------
-=======
 ==============
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts.version
    :no-members:
diff --git a/docs/utilities/scripts_ref.rst b/docs/utilities/scripts_ref.rst
index 06418cf..d5acf52 100644
--- a/docs/utilities/scripts_ref.rst
+++ b/docs/utilities/scripts_ref.rst
@@ -1,11 +1,6 @@
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-Framework utility scripts reference
-===================================
-=======
 ***********************************
 Framework utility scripts reference
 ***********************************
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
 .. automodule:: pywikibot.scripts
    :synopsis: Folder which holds framework scripts
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index fbd05da..9543fc8 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -1876,12 +1876,6 @@
                 # site.months_names do not.
                 if short.endswith('.'):
                     self.origNames2monthNum[func(short[:-1])] = n
-<<<<<<< HEAD   (2530d4 [bugfix] Add Timestamp.__repr__() method to unify the result)
-=======
-
-        self.groups = ['year', 'month', 'hour', 'time', 'day', 'minute',
-                       'tzinfo']
->>>>>>> BRANCH (77cbd3 Update git submodules)
 
         timeR = (r'(?P<time>(?P<hour>([0-1]\d|2[0-3]))[:\.h]'
                  r'(?P<minute>[0-5]\d))')

