Merge remote-tracking branch 'origin/pr/3382'

qutebrowser/browser/downloads.py

@@ -180,7 +180,7 @@ def transform_path(path):
     path = utils.expand_windows_drive(path)
     # Drive dependent working directories are not supported, e.g.
     # E:filename is invalid
-    if re.match(r'[A-Z]:[^\\]', path, re.IGNORECASE):
+    if re.search(r'^[A-Z]:[^\\]', path, re.IGNORECASE):
         return None
     # Paths like COM1, ...
     # See https://github.com/qutebrowser/qutebrowser/issues/82

qutebrowser/browser/webengine/spell.py

@@ -30,7 +30,7 @@ from qutebrowser.utils import log
 def version(filename):
     """Extract the version number from the dictionary file name."""
     version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
-    match = version_re.match(filename)
+    match = version_re.fullmatch(filename)
     if match is None:
         raise ValueError('the given dictionary file name is malformed: {}'
                          .format(filename))

qutebrowser/config/configtypes.py

@@ -963,7 +963,7 @@ class Font(BaseType):
     # Gets set when the config is initialized.
     monospace_fonts = None
     font_regex = re.compile(r"""
-        ^(
+        (
             (
                 # style
                 (?P<style>normal|italic|oblique) |
@@ -976,14 +976,14 @@ class Font(BaseType):
                 (?P<size>[0-9]+((\.[0-9]+)?[pP][tT]|[pP][xX]))
             )\           # size/weight/style are space-separated
         )*               # 0-inf size/weight/style tags
-        (?P<family>.+)$  # mandatory font family""", re.VERBOSE)
+        (?P<family>.+)  # mandatory font family""", re.VERBOSE)
 
     def to_py(self, value):
         self._basic_py_validation(value, str)
         if not value:
             return None
 
-        if not self.font_regex.match(value):  # pragma: no cover
+        if not self.font_regex.fullmatch(value):  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.
             raise configexc.ValidationError(value, "must be a valid font")
@@ -1002,7 +1002,7 @@ class FontFamily(Font):
         if not value:
             return None
 
-        match = self.font_regex.match(value)
+        match = self.font_regex.fullmatch(value)
         if not match:  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.
@@ -1039,7 +1039,7 @@ class QtFont(Font):
         font.setStyle(QFont.StyleNormal)
         font.setWeight(QFont.Normal)
 
-        match = self.font_regex.match(value)
+        match = self.font_regex.fullmatch(value)
         if not match:  # pragma: no cover
             # This should never happen, as the regex always matches everything
             # as family.

qutebrowser/keyinput/basekeyparser.py

@@ -150,7 +150,8 @@ class BaseKeyParser(QObject):
             A (count, command) tuple.
         """
         if self._supports_count:
-            (countstr, cmd_input) = re.match(r'^(\d*)(.*)', keystring).groups()
+            (countstr, cmd_input) = re.fullmatch(r'(\d*)(.*)',
+                                                 keystring).groups()
             count = int(countstr) if countstr else None
             if count == 0 and not cmd_input:
                 cmd_input = keystring

qutebrowser/misc/crashdialog.py

@@ -62,7 +62,7 @@ def parse_fatal_stacktrace(text):
         r'(Current )?[Tt]hread [^ ]* \(most recent call first\): *',
         r'  File ".*", line \d+ in (?P<func>.*)',
     ]
-    m = re.match('\n'.join(lines), text)
+    m = re.search('\n'.join(lines), text)
     if m is None:
         # We got some invalid text.
         return ('', '')

qutebrowser/misc/keyhintwidget.py

@@ -87,7 +87,7 @@ class KeyHintView(QLabel):
         Args:
             prefix: The current partial keystring.
         """
-        countstr, prefix = re.match(r'^(\d*)(.*)', prefix).groups()
+        countstr, prefix = re.fullmatch(r'(\d*)(.*)', prefix).groups()
         if not prefix:
             self._show_timer.stop()
             self.hide()

qutebrowser/utils/debug.py

@@ -184,7 +184,7 @@ def signal_name(sig):
     Return:
         The cleaned up signal name.
     """
-    m = re.match(r'[0-9]+(.*)\(.*\)', sig.signal)
+    m = re.fullmatch(r'[0-9]+(.*)\(.*\)', sig.signal)
     return m.group(1)
 
 

qutebrowser/utils/docutils.py

@@ -156,7 +156,7 @@ class DocstringParser:
     def _parse_arg_inside(self, line):
         """Parse subsequent argument lines."""
         argname = self._cur_arg_name
-        if re.match(r'^[A-Z][a-z]+:$', line):
+        if re.fullmatch(r'[A-Z][a-z]+:', line):
             if not self.arg_descs[argname][-1].strip():
                 self.arg_descs[argname] = self.arg_descs[argname][:-1]
                 return True

qutebrowser/utils/urlutils.py

@@ -306,7 +306,7 @@ def qurl_from_user_input(urlstr):
     """
     # First we try very liberally to separate something like an IPv6 from the
     # rest (e.g. path info or parameters)
-    match = re.match(r'\[?([0-9a-fA-F:.]+)\]?(.*)', urlstr.strip())
+    match = re.fullmatch(r'\[?([0-9a-fA-F:.]+)\]?(.*)', urlstr.strip())
     if match:
         ipstr, rest = match.groups()
     else:
@@ -571,7 +571,7 @@ def incdec_number(url, incdec, count=1, segments=None):
             continue
 
         # Get the last number in a string
-        match = re.match(r'(.*\D|^)(0*)(\d+)(.*)', getter())
+        match = re.fullmatch(r'(.*\D|^)(0*)(\d+)(.*)', getter())
         if not match:
             continue
 

qutebrowser/utils/utils.py

@@ -869,7 +869,7 @@ def expand_windows_drive(path):
     # E:\. The correct way to specifify drive E: is "E:\", but most users
     # probably don't use the "multiple working directories" feature and expect
     # "E:" and "E:\" to be equal.
-    if re.match(r'[A-Z]:$', path, re.IGNORECASE):
+    if re.fullmatch(r'[A-Z]:', path, re.IGNORECASE):
         return path + "\\"
     else:
         return path

scripts/asciidoc2html.py

@@ -154,17 +154,17 @@ class AsciiDoc:
                     hidden = False
                 elif line == "The Compiler <mail@qutebrowser.org>\n":
                     continue
-                elif re.match(r'^:\w+:.*', line):
+                elif re.fullmatch(r':\w+:.*', line):
                     # asciidoc field
                     continue
 
                 if not found_title:
-                    if re.match(r'^=+$', line):
+                    if re.fullmatch(r'=+', line):
                         line = line.replace('=', '-')
                         found_title = True
                         title = last_line.rstrip('\n') + " | qutebrowser\n"
                         title += "=" * (len(title) - 1)
-                    elif re.match(r'^= .+', line):
+                    elif re.fullmatch(r'= .+', line):
                         line = '==' + line[1:]
                         found_title = True
                         title = last_line.rstrip('\n') + " | qutebrowser\n"

scripts/dev/run_vulture.py

@@ -133,7 +133,7 @@ def filter_func(item):
         True if the missing function should be filtered/ignored, False
         otherwise.
     """
-    return bool(re.match(r'[a-z]+[A-Z][a-zA-Z]+', item.name))
+    return bool(re.fullmatch(r'[a-z]+[A-Z][a-zA-Z]+', item.name))
 
 
 def report(items):

scripts/dictcli.py

@@ -142,7 +142,7 @@ def parse_entry(entry):
     dict_re = re.compile(r"""
         (?P<filename>(?P<code>[a-z]{2}(-[A-Z]{2})?).*)\.bdic
     """, re.VERBOSE)
-    match = dict_re.match(entry['name'])
+    match = dict_re.fullmatch(entry['name'])
     if match is not None:
         return match.group('code'), match.group('filename')
     else:

tests/end2end/conftest.py

@@ -74,7 +74,7 @@ def _get_version_tag(tag):
         (?P<version>\d+\.\d+(\.\d+)?)
     """, re.VERBOSE)
 
-    match = version_re.match(tag)
+    match = version_re.fullmatch(tag)
     if not match:
         return None
 
@@ -125,7 +125,7 @@ def _get_dictionary_tag(tag):
         (?P<event>must_have_dict|cannot_have_dict)=(?P<dict>[a-z]{2}-[A-Z]{2})
     """, re.VERBOSE)
 
-    match = dict_re.match(tag)
+    match = dict_re.fullmatch(tag)
     if not match:
         return None
 

tests/end2end/fixtures/quteprocess.py

@@ -48,7 +48,7 @@ def is_ignored_qt_message(message):
     """Check if the message is listed in qt_log_ignore."""
     regexes = pytest.config.getini('qt_log_ignore')
     for regex in regexes:
-        if re.match(regex, message):
+        if re.search(regex, message):
             return True
     return False
 

tests/end2end/fixtures/testprocess.py

@@ -335,7 +335,7 @@ class Process(QObject):
         if expected is None:
             return True
         elif isinstance(expected, regex_type):
-            return expected.match(value)
+            return expected.search(value)
         elif isinstance(value, (bytes, str)):
             return utils.pattern_match(pattern=expected, value=value)
         else:

tests/unit/misc/test_checkpyver.py

@@ -44,7 +44,7 @@ def test_python2():
         pytest.skip("python2 not found")
     assert not proc.stdout
     stderr = proc.stderr.decode('utf-8')
-    assert re.match(TEXT, stderr), stderr
+    assert re.fullmatch(TEXT, stderr), stderr
     assert proc.returncode == 1
 
 
@@ -64,7 +64,7 @@ def test_patched_no_errwindow(capfd, monkeypatch):
     checkpyver.check_python_version()
     stdout, stderr = capfd.readouterr()
     assert not stdout
-    assert re.match(TEXT, stderr), stderr
+    assert re.fullmatch(TEXT, stderr), stderr
 
 
 def test_patched_errwindow(capfd, mocker, monkeypatch):

tests/unit/utils/test_debug.py

@@ -90,8 +90,8 @@ class TestLogTime:
 
             assert len(caplog.records) == 1
 
-            pattern = re.compile(r'^Foobar took ([\d.]*) seconds\.$')
-            match = pattern.match(caplog.records[0].msg)
+            pattern = re.compile(r'Foobar took ([\d.]*) seconds\.')
+            match = pattern.fullmatch(caplog.records[0].msg)
             assert match
 
             duration = float(match.group(1))

tests/unit/utils/test_utils.py

@@ -863,7 +863,7 @@ class TestOpenFile:
         cmdline = '{} -c pass'.format(executable)
         utils.open_file('/foo/bar', cmdline)
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r'Opening /foo/bar with \[.*python.*/foo/bar.*\]', result)
 
     @pytest.mark.not_frozen
@@ -872,7 +872,7 @@ class TestOpenFile:
         cmdline = '{} -c pass {{}} raboof'.format(executable)
         utils.open_file('/foo/bar', cmdline)
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with \[.*python.*/foo/bar.*'raboof'\]", result)
 
     @pytest.mark.not_frozen
@@ -882,7 +882,7 @@ class TestOpenFile:
         config_stub.val.downloads.open_dispatcher = cmdline
         utils.open_file('/foo/bar')
         result = caplog.records[1].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with \[.*python.*/foo/bar.*\]", result)
 
     def test_system_default_application(self, caplog, config_stub, mocker):
@@ -890,7 +890,7 @@ class TestOpenFile:
                          new_callable=mocker.Mock)
         utils.open_file('/foo/bar')
         result = caplog.records[0].message
-        assert re.match(
+        assert re.fullmatch(
             r"Opening /foo/bar with the system application", result)
         m.assert_called_with(QUrl('file:///foo/bar'))