upstream/mercurial-mirror Files · mercurial/node.py

py3: avoid iterating over a literal bytes in highlight...

py3: avoid iterating over a literal bytes in highlight In Python 3, iterating over a bytes literal yields integers. Since we use the value in `text.replace()`, this fails on Python 3 with the following trackback: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgwebdir_mod.py", line 378, in run_wsgi for r in self._runwsgi(req, res): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 326, in run_wsgi for r in self._runwsgi(req, res, repo): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 449, in _runwsgi return getattr(webcommands, cmd)(rctx) File "/usr/lib/python3/dist-packages/mercurial/hgweb/webcommands.py", line 211, in file return _filerevision(web, webutil.filectx(web.repo, web.req)) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 72, in filerevision_highlight pygmentize(web, b'fileline', fctx, web.tmpl) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 58, in pygmentize field, fctx, style, tmpl, guessfilenameonly=filenameonly File "/usr/lib/python3/dist-packages/hgext/highlight/highlight.py", line 62, in pygmentize text = text.replace(c, b'') TypeError: a bytes-like object is required, not 'int'

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r44014:856cce0c

stable

Download file

             node.py
        
                    49 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # node.py - basic nodeid manipulation for mercurial

      #

      # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      import binascii

      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      # Adapt to Python 3 API changes. If this ends up showing up in

      # profiles, we can use this version only on Python 3, and forward

      # binascii.unhexlify like we used to on Python 2.

      def bin(s):

          try:

              return binascii.unhexlify(s)

          except binascii.Error as e:

              raise TypeError(e)

      nullrev = -1

      # In hex, this is '0000000000000000000000000000000000000000'

      nullid = b"\0" * 20

      nullhex = hex(nullid)

      # Phony node value to stand-in for new files in some uses of

      # manifests.

      # In hex, this is '2121212121212121212121212121212121212121'

      newnodeid = b'!!!!!!!!!!!!!!!!!!!!'

      # In hex, this is '3030303030303030303030303030306164646564'

      addednodeid = b'000000000000000added'

      # In hex, this is '3030303030303030303030306d6f646966696564'

      modifiednodeid = b'000000000000modified'

      wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

      # pseudo identifiers for working directory

      # (they are experimental, so don't add too many dependencies on them)

      wdirrev = 0x7FFFFFFF

      # In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'

      wdirid = b"\xff" * 20

      wdirhex = hex(wdirid)

      def short(node):

          return hex(node[:6])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# node.py - basic nodeid manipulation for mercurial
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				import binascii

				# This ugly style has a noticeable effect in manifest parsing
				hex = binascii.hexlify
				# Adapt to Python 3 API changes. If this ends up showing up in
				# profiles, we can use this version only on Python 3, and forward
				# binascii.unhexlify like we used to on Python 2.
				def bin(s):
				try:
				return binascii.unhexlify(s)
				except binascii.Error as e:
				raise TypeError(e)


				nullrev = -1
				# In hex, this is '0000000000000000000000000000000000000000'
				nullid = b"\0" * 20
				nullhex = hex(nullid)

				# Phony node value to stand-in for new files in some uses of
				# manifests.
				# In hex, this is '2121212121212121212121212121212121212121'
				newnodeid = b'!!!!!!!!!!!!!!!!!!!!'
				# In hex, this is '3030303030303030303030303030306164646564'
				addednodeid = b'000000000000000added'
				# In hex, this is '3030303030303030303030306d6f646966696564'
				modifiednodeid = b'000000000000modified'

				wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

				# pseudo identifiers for working directory
				# (they are experimental, so don't add too many dependencies on them)
				wdirrev = 0x7FFFFFFF
				# In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
				wdirid = b"\xff" * 20
				wdirhex = hex(wdirid)


				def short(node):
				return hex(node[:6])