subversion.py: fixed issues introduced with the removal of QRegExp. maintenance

Mon, 28 Dec 2020 19:43:35 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 28 Dec 2020 19:43:35 +0100
branch
maintenance
changeset 7919
b53ea4decd93
parent 7918
f136c57fdf35
child 7922
92297aa58a1d

subversion.py: fixed issues introduced with the removal of QRegExp.
(grafted from e04b7a25e241b0225a27ee4b78c8db745dfcb65d)

eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Dec 21 12:15:47 2020 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py	Mon Dec 28 19:43:35 2020 +0100
@@ -1357,13 +1357,13 @@
                     for line in output.splitlines():
                         match = self.rx_status1.fullmatch(line)
                         if match is not None:
-                            flags = self.rx_status1.group(1)
-                            path = self.rx_status1.group(5).strip()
+                            flags = match.group(1)
+                            path = match.group(5).strip()
                         else:
                             match = self.rx_status2.fullmatch(line)
                             if match is not None:
-                                flags = self.rx_status2.group(1)
-                                path = self.rx_status2.group(2).strip()
+                                flags = match.group(1)
+                                path = match.group(2).strip()
                             else:
                                 continue
                         name = os.path.normcase(path)
@@ -1426,13 +1426,13 @@
                     for line in output.splitlines():
                         match = self.rx_status1.fullmatch(line)
                         if match is not None:
-                            flags = self.rx_status1.group(1)
-                            path = self.rx_status1.group(5).strip()
+                            flags = match.group(1)
+                            path = match.group(5).strip()
                         else:
                             match = self.rx_status2.fullmatch(line)
                             if match is not None:
-                                flags = self.rx_status2.group(1)
-                                path = self.rx_status2.group(2).strip()
+                                flags = match.group(1)
+                                path = match.group(2).strip()
                             else:
                                 continue
                         name = os.path.normcase(path)

eric ide

mercurial