changeset 5176:b9af7b8f3eee

compat: drop import compatibility <= 4.5 for `forcebytestr` We no longer support 4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 04 Mar 2020 16:03:23 +0100
parents 307bb57ff2ce
children 9f3ad17b62ef
files hgext3rd/evolve/depthcache.py hgext3rd/evolve/firstmergecache.py hgext3rd/evolve/obscache.py hgext3rd/evolve/obsdiscovery.py hgext3rd/evolve/stablerangecache.py hgext3rd/evolve/stablesort.py
diffstat 6 files changed, 6 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/depthcache.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/depthcache.py	Wed Mar 04 16:03:23 2020 +0100
@@ -16,11 +16,7 @@
     scmutil,
 )
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from . import (
     compat,
--- a/hgext3rd/evolve/firstmergecache.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/firstmergecache.py	Wed Mar 04 16:03:23 2020 +0100
@@ -16,11 +16,7 @@
     node as nodemod,
 )
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from . import (
     compat,
--- a/hgext3rd/evolve/obscache.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/obscache.py	Wed Mar 04 16:03:23 2020 +0100
@@ -19,11 +19,7 @@
     util,
 )
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from . import (
     compat,
--- a/hgext3rd/evolve/obsdiscovery.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/obsdiscovery.py	Wed Mar 04 16:03:23 2020 +0100
@@ -34,11 +34,7 @@
 )
 from mercurial.i18n import _
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from . import (
     compat,
--- a/hgext3rd/evolve/stablerangecache.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/stablerangecache.py	Wed Mar 04 16:03:23 2020 +0100
@@ -22,11 +22,7 @@
     util,
 )
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from . import (
     compat,
--- a/hgext3rd/evolve/stablesort.py	Wed Mar 04 15:21:32 2020 -0800
+++ b/hgext3rd/evolve/stablesort.py	Wed Mar 04 16:03:23 2020 +0100
@@ -259,11 +259,7 @@
     scmutil,
 )
 
-try:
-    from mercurial.utils.stringutil import forcebytestr
-except ImportError:
-    # hg <= 4.5 (f99d64e8a4e4)
-    from mercurial.util import forcebytestr
+from mercurial.utils.stringutil import forcebytestr
 
 from mercurial.i18n import _