py3: fix type of some elements of __all__ lists stable
authorManuel Jacob <me@manueljacob.de>
Mon, 05 Aug 2024 20:47:17 +0200
branchstable
changeset 51789 99632adff795
parent 51760 7d9bd50afe3d
child 51790 ecc3a893979d
py3: fix type of some elements of __all__ lists
hgext/highlight/__init__.py
hgext/zeroconf/Zeroconf.py
mercurial/hgweb/hgweb_mod.py
mercurial/hgweb/webcommands.py
mercurial/lsprof.py
mercurial/statprof.py
tests/hgweberror.py
--- a/hgext/highlight/__init__.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/hgext/highlight/__init__.py	Mon Aug 05 20:47:17 2024 +0200
@@ -105,4 +105,4 @@
     )
     extensions.wrapfunction(webcommands, 'annotate', annotate_highlight)
     webcommands.highlightcss = generate_css
-    webcommands.__all__.append(b'highlightcss')
+    webcommands.__all__.append('highlightcss')
--- a/hgext/zeroconf/Zeroconf.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/hgext/zeroconf/Zeroconf.py	Mon Aug 05 20:47:17 2024 +0200
@@ -89,7 +89,7 @@
 
 from mercurial import pycompat
 
-__all__ = [b"Zeroconf", b"ServiceInfo", b"ServiceBrowser"]
+__all__ = ["Zeroconf", "ServiceInfo", "ServiceBrowser"]
 
 # hook for threads
 
--- a/mercurial/hgweb/hgweb_mod.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/mercurial/hgweb/hgweb_mod.py	Mon Aug 05 20:47:17 2024 +0200
@@ -464,7 +464,7 @@
 
                 res.headers[b'ETag'] = tag
 
-            if cmd not in webcommands.__all__:
+            if pycompat.sysstr(cmd) not in webcommands.__all__:
                 msg = b'no such method: %s' % cmd
                 raise ErrorResponse(HTTP_BAD_REQUEST, msg)
             else:
--- a/mercurial/hgweb/webcommands.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/mercurial/hgweb/webcommands.py	Mon Aug 05 20:47:17 2024 +0200
@@ -72,7 +72,7 @@
         self.name = name
 
     def __call__(self, func):
-        __all__.append(self.name)
+        __all__.append(pycompat.sysstr(self.name))
         commands[self.name] = func
         return func
 
--- a/mercurial/lsprof.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/mercurial/lsprof.py	Mon Aug 05 20:47:17 2024 +0200
@@ -6,7 +6,7 @@
 # PyPy doesn't expose profiler_entry from the module.
 profiler_entry = getattr(_lsprof, 'profiler_entry', None)
 
-__all__ = [b'profile', b'Stats']
+__all__ = ['profile', 'Stats']
 
 
 def profile(f, *args, **kwds):
--- a/mercurial/statprof.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/mercurial/statprof.py	Mon Aug 05 20:47:17 2024 +0200
@@ -122,7 +122,7 @@
 defaultdict = collections.defaultdict
 contextmanager = contextlib.contextmanager
 
-__all__ = [b'start', b'stop', b'reset', b'display', b'profile']
+__all__ = ['start', 'stop', 'reset', 'display', 'profile']
 
 skips = {
     "util.py:check",
--- a/tests/hgweberror.py	Thu Aug 01 11:14:58 2024 +0100
+++ b/tests/hgweberror.py	Mon Aug 05 20:47:17 2024 +0200
@@ -20,4 +20,4 @@
 
 def extsetup(ui):
     setattr(webcommands, 'raiseerror', raiseerror)
-    webcommands.__all__.append(b'raiseerror')
+    webcommands.__all__.append('raiseerror')