[Snyk] Security upgrade werkzeug from 2.0.3 to 2.2.3

docs/conf.py

@@ -21,7 +21,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-import re
+import regex as re
 import sys
 import warnings
 from os.path import abspath, dirname, join

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+force-exclude = '.'

pywikibot/__init__.py

@@ -7,7 +7,7 @@
 import atexit
 import datetime
 import math
-import re
+import regex as re
 import sys
 import threading
 from contextlib import suppress

pywikibot/backports.py

@@ -86,7 +86,7 @@ def __exit__(self, *args: Any) -> None:
         Mapping,
         Sequence,
     )
-    from re import Match, Pattern
+    from regex import Match, Pattern
     Dict = dict  # type: ignore[misc]
     FrozenSet = frozenset  # type: ignore[misc]
     List = list  # type: ignore[misc]

pywikibot/bot.py

@@ -1378,6 +1378,7 @@ def current_page(self, page: 'pywikibot.page.BasePage') -> None:
                 stdout(msg)
 
     def user_confirm(self, question: str) -> bool:
+        return True
         """Obtain user response if bot option 'always' not enabled."""
         if self.opt.always:
             return True

pywikibot/bot_choice.py

@@ -4,7 +4,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 from abc import ABC, abstractmethod
 from textwrap import fill
 from typing import Any, Optional

pywikibot/comms/http.py

@@ -28,7 +28,7 @@
 #
 import atexit
 import codecs
-import re
+import regex as re
 import sys
 from contextlib import suppress
 from http import HTTPStatus, cookiejar

pywikibot/config.py

@@ -37,7 +37,7 @@
 import copy
 import os
 import platform
-import re
+import regex as re
 import stat
 import sys
 import types

pywikibot/cosmetic_changes.py

@@ -54,7 +54,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 from contextlib import suppress
 from enum import IntEnum
 from typing import Any, Union

pywikibot/data/api/_login.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import datetime
-import re
+import regex as re
 from typing import Optional
 
 import pywikibot

pywikibot/data/api/_requests.py

@@ -10,7 +10,7 @@
 import os
 import pickle
 import pprint
-import re
+import regex as re
 import traceback
 from collections.abc import MutableMapping
 from email.mime.nonmultipart import MIMENonMultipart

pywikibot/date.py

@@ -6,7 +6,7 @@
 #
 import calendar
 import datetime
-import re
+import regex as re
 from collections import abc, defaultdict
 from contextlib import suppress
 from functools import singledispatch

pywikibot/exceptions.py

@@ -166,7 +166,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 from typing import Any, Optional, Union
 
 import pywikibot

pywikibot/family.py

@@ -6,7 +6,7 @@
 #
 import collections
 import logging
-import re
+import regex as re
 import string
 import sys
 import types

pywikibot/fixes.py

@@ -43,14 +43,15 @@
     'HTML': {
         'regex': True,
         'msg': 'pywikibot-fixes-html',
+        "generator": "-start::! -start:project:! -start:template:! -start:category:!",
         'replacements': [
             # Everything case-insensitive (?i)
             # Keep in mind that MediaWiki automatically converts <br> to <br />
             # when rendering pages, so you might comment the next two lines out
             # to save some time/edits.
-            (r'(?i)<br *>',                      r'<br />'),
+            (r'(?i)<br */?>',                      r'<br>'),
             # linebreak with attributes
-            (r'(?i)<br ([^>/]+?)>',            r'<br \1 />'),
+            (r'(?i)<br *([^>/]+?) */?>',            r'<br \1>'),
             (r'(?i)<b>(.*?)</b>',              r"'''\1'''"),
             (r'(?i)<strong>(.*?)</strong>',    r"'''\1'''"),
             (r'(?i)<i>(.*?)</i>',              r"''\1''"),
@@ -78,6 +79,7 @@
         ],
         'exceptions': {
             'inside-tags': [
+                "keep",
                 'nowiki',
                 'comment',
                 'math',
@@ -185,6 +187,7 @@
     'syntax': {
         'regex': True,
         'msg': 'pywikibot-fixes-syntax',
+        "generator": "-start::! -start:project:! -start:template:! -start:category:!",
         'replacements': [
             # external link in double brackets
             (r'\[\[(?P<url>https?://[^\]]+?)\]\]',   r'[\g<url>]'),
@@ -199,8 +202,8 @@
             # external link and description separated by a dash.
             # ATTENTION: while this is a mistake in most cases, there are some
             # valid URLs that contain dashes!
-            (r'\[(?P<url>https?://[^\|\]\s]+?) *\| *(?P<label>[^\|\]]+?)\]',
-             r'[\g<url> \g<label>]'),
+            # (r'\[(?P<url>https?://[^\|\]\s]+?) *\| *(?P<label>[^\|\]]+?)\]',
+            #  r'[\g<url> \g<label>]'),
             # wiki link closed by single bracket.
             # ATTENTION: There are some false positives, for example
             # Brainfuck code examples or MS-DOS parameter instructions.
@@ -217,6 +220,7 @@
         ],
         'exceptions': {
             'inside-tags': [
+                "keep",
                 'nowiki',
                 'comment',
                 'math',
@@ -415,6 +419,7 @@
         ],
         'exceptions': {
             'inside-tags': [
+                "keep",
                 'comment',
                 'hyperlink',
             ],
@@ -582,6 +587,7 @@
             'en': 'Robot: Fixing special page capitalisation',
             'fa': 'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه',
         },
+        "generator": "-start::! -start:project:! -start:template:! -start:category:!",
         'replacements': [
             ('Special:Allpages',        'Special:AllPages'),
             ('Special:Blockip',         'Special:BlockIP'),
@@ -602,6 +608,11 @@
             ('Special:Userlogout',      'Special:UserLogout'),
             ('Special:Whatlinkshere',   'Special:WhatLinksHere'),
         ],
+        'exceptions': {
+            'inside-tags': [
+                "keep",
+            ],
+        },
     },
     # yu top-level domain will soon be disabled, see
     # https://lists.wikimedia.org/pipermail/wikibots-l/2009-February/000290.html

pywikibot/i18n.py

@@ -22,7 +22,7 @@
 import json
 import os
 import pkgutil
-import re
+import regex as re
 from collections import abc, defaultdict
 from contextlib import suppress
 from pathlib import Path

pywikibot/page/_links.py

@@ -10,7 +10,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 import unicodedata
 from html.entities import name2codepoint
 

pywikibot/page/_pages.py

@@ -20,7 +20,7 @@
 # Distributed under the terms of the MIT license.
 #
 import itertools
-import re
+import regex as re
 from collections import Counter, defaultdict
 from contextlib import suppress
 from itertools import islice
@@ -1979,7 +1979,7 @@ def undelete(self, reason: Optional[str] = None) -> None:
             pywikibot.output('Undeleting {}.'.format(self.title(as_link=True)))
             reason = pywikibot.input(
                 'Please enter a reason for the undeletion:')
-        self.site.undelete(self, reason, revision=undelete_revs)
+        self.site.undelete(self, reason)
 
     def protect(self,
                 reason: Optional[str] = None,

pywikibot/page/_wikibase.py

@@ -14,7 +14,7 @@
 # Distributed under the terms of the MIT license.
 #
 import json as jsonlib
-import re
+import regex as re
 from collections import OrderedDict, defaultdict
 from contextlib import suppress
 from itertools import chain

pywikibot/pagegenerators/_factory.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import itertools
-import re
+import regex as re
 import sys
 from datetime import timedelta
 from functools import partial

pywikibot/pagegenerators/_filters.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import datetime
-import re
+import regex as re
 from collections import namedtuple
 from functools import partial
 from typing import Optional, Union

pywikibot/pagegenerators/_generators.py

@@ -7,7 +7,7 @@
 import calendar
 import codecs
 import io
-import re
+import regex as re
 import sys
 from collections import abc
 from functools import partial

pywikibot/proofreadpage.py

@@ -27,7 +27,7 @@
 # Distributed under the terms of the MIT license.
 #
 import json
-import re
+import regex as re
 import time
 from functools import partial
 from http import HTTPStatus

pywikibot/scripts/generate_user_files.py

@@ -11,7 +11,7 @@
 #
 import codecs
 import os
-import re
+import regex as re
 import sys
 from collections import namedtuple
 from pathlib import Path

pywikibot/site/_apisite.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import datetime
-import re
+import regex as re
 import time
 import typing
 from collections import OrderedDict, defaultdict, namedtuple

pywikibot/site/_basesite.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import functools
-import re
+import regex as re
 import threading
 from typing import Optional
 from warnings import warn

pywikibot/site/_siteinfo.py

@@ -6,7 +6,7 @@
 #
 import copy
 import datetime
-import re
+import regex as re
 from collections.abc import Container
 from contextlib import suppress
 from typing import Any, Optional, Union

pywikibot/site_detect.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import json
-import re
+import regex as re
 from contextlib import suppress
 from html.parser import HTMLParser
 from http import HTTPStatus

pywikibot/textlib.py

@@ -10,7 +10,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 from collections import OrderedDict, namedtuple
 from collections.abc import Sequence
 from contextlib import suppress
@@ -304,6 +304,7 @@ def _create_default_regexes() -> None:
         'table': re.compile(
             r'(?:(?<=\n)|\A){\|[\S\s]*?\n\|}|%s' % _tag_pattern('table')),
         'template': NESTED_TEMPLATE_REGEX,
+        'keep': re.compile(r'<div class="as-is">[\s\S]*?</div>'),
     })
 
 

pywikibot/time.py

@@ -9,7 +9,7 @@
 #
 import datetime
 import math
-import re
+import regex as re
 import types
 from typing import Type, Union
 

pywikibot/tools/__init__.py

@@ -9,7 +9,7 @@
 import ipaddress
 import os
 import queue
-import re
+import regex as re
 import stat
 import subprocess
 import sys

pywikibot/tools/_deprecate.py

@@ -25,7 +25,7 @@
 #
 import collections
 import inspect
-import re
+import regex as re
 import sys
 import types
 from contextlib import suppress

pywikibot/tools/chars.py

@@ -4,7 +4,7 @@
 #
 # Distributed under the terms of the MIT license.
 #
-import re
+import regex as re
 import sys
 from contextlib import suppress
 from typing import Union

pywikibot/tools/djvu.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import os
-import re
+import regex as re
 import subprocess
 from collections import Counter
 

pywikibot/tools/formatter.py

@@ -5,7 +5,7 @@
 # Distributed under the terms of the MIT license.
 #
 import math
-import re
+import regex as re
 
 from pywikibot.logging import output
 from pywikibot.tools import deprecated