Xqt submitted this change.

View Change

Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved
[doc] add archive scripts to scripts description

Change-Id: I0d0118657952def1f34efa71cc2f4396b5887b86
---
M docs/index.rst
A docs/scripts/archive.rst
M docs/scripts/index.rst
A docs/scripts/maintenance.rst
D docs/scripts/scripts.archive.rst
D docs/scripts/scripts.i18n.rst
D docs/scripts/scripts.maintenance.rst
D docs/scripts/scripts.userscripts.rst
M scripts/archive/imagecopy_self.py
9 files changed, 225 insertions(+), 61 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index e870ec5..437704c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,7 +23,7 @@
or higher is recommended.

Pywikibot and this documentation are licensed under the
-:ref:`MIT license <licenses-MIT>`;
+:ref:`MIT license`;
manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license.

See also: `Pywikibot Manual`_ at https://www.mediawiki.org
@@ -66,7 +66,7 @@
.. toctree::
:maxdepth: 1

- scripts/scripts.maintenance
+ scripts_ref/scripts.maintenance
scripts_ref/index


diff --git a/docs/scripts/archive.rst b/docs/scripts/archive.rst
new file mode 100644
index 0000000..f2a9ca6
--- /dev/null
+++ b/docs/scripts/archive.rst
@@ -0,0 +1,179 @@
+Archived scripts
+================
+
+.. automodule:: scripts.archive
+
+capitalize\_redirects script
+----------------------------
+
+.. automodule:: scripts.archive.capitalize_redirects
+ :no-members:
+
+casechecker script
+------------------
+
+.. automodule:: scripts.archive.casechecker
+ :no-members:
+
+catall script
+-------------
+
+.. automodule:: scripts.archive.catall
+ :no-members:
+
+commons\_link script
+--------------------
+
+.. automodule:: scripts.archive.commons_link
+ :no-members:
+
+create_categories script
+------------------------
+
+.. automodule:: scripts.archive.create_categories
+ :no-members:
+
+disambredirs script
+-------------------
+
+.. automodule:: scripts.archive.disambredir
+ :no-members:
+
+editarticle script
+------------------
+
+.. automodule:: scripts.archive.editarticle
+ :no-members:
+
+flickrripper script
+-------------------
+
+.. automodule:: scripts.archive.flickrripper
+ :no-members:
+
+followlive
+----------
+
+.. automodule:: scripts.archive.followlive
+ :no-members:
+
+freebasemappingupload script
+----------------------------
+
+.. automodule:: scripts.archive.freebasemappingupload
+ :no-members:
+
+imagecopy script
+----------------
+
+.. automodule:: scripts.archive.imagecopy
+ :no-members:
+
+imagecopy\_self script
+----------------------
+
+.. automodule:: scripts.archive.imagecopy_self
+ :no-members:
+
+imageharvest script
+-------------------
+
+.. automodule:: scripts.archive.imageharvest
+ :no-members:
+
+imagerecat script
+-----------------
+
+.. automodule:: scripts.archive.imagerecat
+ :no-members:
+
+imageuncat script
+-----------------
+
+.. automodule:: scripts.archive.imageuncat
+ :no-members:
+
+isbn script
+-----------
+
+.. automodule:: scripts.archive.isbn
+ :no-members:
+
+lonelypages script
+------------------
+
+.. automodule:: scripts.archive.lonelypages
+ :no-members:
+
+makecat script
+--------------
+
+.. automodule:: scripts.archive.makecat
+ :no-members:
+
+match\_images script
+--------------------
+
+.. automodule:: scripts.archive.match_images
+ :no-members:
+
+ndashredir script
+-----------------
+
+.. automodule:: scripts.archive.ndashredir
+ :no-members:
+
+piper script
+------------
+
+.. automodule:: scripts.archive.piper
+ :no-members:
+
+selflink script
+---------------
+
+.. automodule:: scripts.archive.selflink
+ :no-members:
+
+spamremove script
+-----------------
+
+.. automodule:: scripts.archive.spamremove
+ :no-members:
+
+standardize\_interwiki script
+-----------------------------
+
+.. automodule:: scripts.archive.standardize_interwiki
+ :no-members:
+
+states\_redirect script
+-----------------------
+
+.. automodule:: scripts.archive.states_redirect
+ :no-members:
+
+surnames\_redirects script
+--------------------------
+
+.. automodule:: scripts.archive.surnames_redirects
+ :no-members:
+
+table2wiki script
+-----------------
+
+.. automodule:: scripts.archive.table2wiki
+ :no-members:
+
+unlink script
+-------------
+
+.. automodule:: scripts.archive.unlink
+ :no-members:
+
+wikisourcetext script
+---------------------
+
+.. automodule:: scripts.archive.wikisourcetext
+ :no-members:
+
diff --git a/docs/scripts/index.rst b/docs/scripts/index.rst
index 868b105..131fdb4 100644
--- a/docs/scripts/index.rst
+++ b/docs/scripts/index.rst
@@ -25,4 +25,6 @@
wikibase
nonedit
other
- unsorted
\ No newline at end of file
+ unsorted
+ maintenance
+ archive
\ No newline at end of file
diff --git a/docs/scripts/maintenance.rst b/docs/scripts/maintenance.rst
new file mode 100644
index 0000000..9c38b68
--- /dev/null
+++ b/docs/scripts/maintenance.rst
@@ -0,0 +1,39 @@
+Utility scripts
+===============
+
+cache script
+------------
+
+.. automodule:: scripts.maintenance.cache
+ :no-members:
+
+colors script
+-------------
+
+.. automodule:: scripts.maintenance.colors
+ :no-members:
+
+preload_sites script
+--------------------
+
+.. automodule:: scripts.maintenance.preload_sites
+ :no-members:
+
+sorting\_order script
+---------------------
+
+.. automodule:: scripts.maintenance.sorting_order
+ :no-members:
+
+update\_linktrails script
+-------------------------
+
+.. automodule:: scripts.maintenance.update_linktrails
+ :no-members:
+
+wikimedia\_sites script
+-----------------------
+
+.. automodule:: scripts.maintenance.wikimedia_sites
+ :no-members:
+
diff --git a/docs/scripts/scripts.archive.rst b/docs/scripts/scripts.archive.rst
deleted file mode 100644
index 79c34d1..0000000
--- a/docs/scripts/scripts.archive.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-scripts.archive archived scripts
-================================
-
-.. automodule:: scripts.archive
\ No newline at end of file
diff --git a/docs/scripts/scripts.i18n.rst b/docs/scripts/scripts.i18n.rst
deleted file mode 100644
index 20aa2a0..0000000
--- a/docs/scripts/scripts.i18n.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-scripts.i18n translation files
-==============================
-
-.. automodule:: scripts.i18n
\ No newline at end of file
diff --git a/docs/scripts/scripts.maintenance.rst b/docs/scripts/scripts.maintenance.rst
deleted file mode 100644
index e7bb9c4..0000000
--- a/docs/scripts/scripts.maintenance.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-scripts.maintenance utility scripts
-===================================
-
-.. automodule:: scripts.maintenance
-
-Submodules
-----------
-
-scripts.maintenance.cache script
---------------------------------
-
-.. automodule:: scripts.maintenance.cache
- :ignore-module-all:
-
-scripts.maintenance.colors script
----------------------------------
-
-.. automodule:: scripts.maintenance.colors
-
-scripts.maintenance.make\_i18n\_dict script
--------------------------------------------
-
-.. automodule:: scripts.maintenance.make_i18n_dict
-
-scripts.maintenance.preload_sites script
------------------------------------------
-
-.. automodule:: scripts.maintenance.preload_sites
-
-scripts.maintenance.sorting\_order script
------------------------------------------
-
-.. automodule:: scripts.maintenance.sorting_order
-
-scripts.maintenance.update\_linktrails script
----------------------------------------------
-
-.. automodule:: scripts.maintenance.update_linktrails
-
-scripts.maintenance.wikimedia\_sites script
--------------------------------------------
-
-.. automodule:: scripts.maintenance.wikimedia_sites
-
diff --git a/docs/scripts/scripts.userscripts.rst b/docs/scripts/scripts.userscripts.rst
deleted file mode 100644
index 60ac1d4..0000000
--- a/docs/scripts/scripts.userscripts.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-scripts.userscripts user scripts
-================================
-
-.. automodule:: scripts.userscripts
-
diff --git a/scripts/archive/imagecopy_self.py b/scripts/archive/imagecopy_self.py
index 57d9f83..c969446 100755
--- a/scripts/archive/imagecopy_self.py
+++ b/scripts/archive/imagecopy_self.py
@@ -47,7 +47,8 @@
from pywikibot import i18n, pagegenerators
from pywikibot.specialbots import UploadRobot
from pywikibot.textlib import removeCategoryLinks
-from scripts import image, imagerecat
+from scripts import image
+from scripts.archive import imagerecat


try:

To view, visit change 774889. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I0d0118657952def1f34efa71cc2f4396b5887b86
Gerrit-Change-Number: 774889
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged