jenkins-bot submitted this change.

View Change

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

[clanup] Remove pywikibot.QuitKeyboardInterrupt deprecated for 6 years

also do not publish private _QuitKeyboardInterrupt class

Change-Id: I6f04b5f4664cd99477fb3579f3cf5bc0adc6ef24
---
M pywikibot/__init__.py
1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 965dc1e..1de3a69 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -45,9 +45,6 @@
     show_help,
     ui,
 )
-from pywikibot.bot_choice import (
-    QuitKeyboardInterrupt as _QuitKeyboardInterrupt,
-)
 from pywikibot.diff import PatchManager
 from pywikibot.family import AutoFamily, Family
 from pywikibot.i18n import translate
@@ -128,14 +125,14 @@
     'NoCreateError', 'NoMoveTarget', 'NoPage', 'NoUsername',
     'NoWikibaseEntity', 'OtherPageSaveError', 'output', 'Page',
     'PageCreatedConflict', 'PageDeletedConflict', 'PageRelatedError',
-    'PageSaveRelatedError', 'PropertyPage', '_QuitKeyboardInterrupt',
-    'SectionError', 'Server414Error', 'Server504Error', 'ServerError',
-    'showDiff', 'show_help', 'Site', 'SiteDefinitionError', 'SiteLink',
-    'SpamblacklistError', 'stdout', 'Timestamp', 'TitleblacklistError',
-    'translate', 'ui', 'unicode2html', 'UnknownExtension', 'UnknownFamily',
-    'UnknownSite', 'UnsupportedPage', 'UploadWarning', 'url2unicode', 'User',
-    'warning', 'WbGeoShape', 'WbMonolingualText', 'WbQuantity',
-    'WbTabularData', 'WbTime', 'WbUnknown', 'WikiBaseError', 'WikidataBot',
+    'PageSaveRelatedError', 'PropertyPage', 'SectionError', 'Server414Error',
+    'Server504Error', 'ServerError', 'showDiff', 'show_help', 'Site',
+    'SiteDefinitionError', 'SiteLink', 'SpamblacklistError', 'stdout',
+    'Timestamp', 'TitleblacklistError', 'translate', 'ui', 'unicode2html',
+    'UnknownExtension', 'UnknownFamily', 'UnknownSite', 'UnsupportedPage',
+    'UploadWarning', 'url2unicode', 'User', 'warning', 'WbGeoShape',
+    'WbMonolingualText', 'WbQuantity', 'WbTabularData', 'WbTime', 'WbUnknown',
+    'WikiBaseError', 'WikidataBot',
 )
 
 
@@ -1356,11 +1353,6 @@
 _putthread.setDaemon(True)
 
 wrapper = _ModuleDeprecationWrapper(__name__)
-wrapper._add_deprecated_attr(
-    'QuitKeyboardInterrupt', _QuitKeyboardInterrupt,
-    warning_message='pywikibot.QuitKeyboardInterrupt is deprecated; '
-                    'use pywikibot.bot.QuitKeyboardInterrupt instead.',
-    since='20150619', future_warning=True)
 wrapper._add_deprecated_attr('__release__', __version__,
                              replacement_name='pywikibot.__version__',
                              since='20200707')

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