upstream/mercurial-mirror Files · mercurial/scmwindows.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

             scmwindows.py
        
                    65 lines
            
             | 1.9 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / scmwindows.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import os

      from . import (

          encoding,

          pycompat,

          util,

          win32,

      )

      try:

          import _winreg as winreg

          winreg.CloseKey

      except ImportError:

          import winreg

      # MS-DOS 'more' is the only pager available by default on Windows.

      fallbackpager = b'more'

      def systemrcpath():

          '''return default os-specific hgrc search path'''

          rcpath = []

          filename = win32.executablepath()

          # Use mercurial.ini found in directory with hg.exe

          progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')

          rcpath.append(progrc)

          # Use hgrc.d found in directory with hg.exe

          progrcd = os.path.join(os.path.dirname(filename), b'hgrc.d')

          if os.path.isdir(progrcd):

              for f, kind in util.listdir(progrcd):

                  if f.endswith(b'.rc'):

                      rcpath.append(os.path.join(progrcd, f))

          # else look for a system rcpath in the registry

          value = util.lookupreg(

              b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE

          )

          if not isinstance(value, str) or not value:

              return rcpath

          value = util.localpath(value)

          for p in value.split(pycompat.ospathsep):

              if p.lower().endswith(b'mercurial.ini'):

                  rcpath.append(p)

              elif os.path.isdir(p):

                  for f, kind in util.listdir(p):

                      if f.endswith(b'.rc'):

                          rcpath.append(os.path.join(p, f))

          return rcpath

      def userrcpath():

          '''return os-specific hgrc search path to the user dir'''

          home = os.path.expanduser(b'~')

          path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]

          userprofile = encoding.environ.get(b'USERPROFILE')

          if userprofile and userprofile != home:

              path.append(os.path.join(userprofile, b'mercurial.ini'))

              path.append(os.path.join(userprofile, b'.hgrc'))

          return path

      def termsize(ui):

          return win32.termsize()

	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

				from __future__ import absolute_import

				import os

				from . import (
				encoding,
				pycompat,
				util,
				win32,
				)

				try:
				import _winreg as winreg

				winreg.CloseKey
				except ImportError:
				import winreg

				# MS-DOS 'more' is the only pager available by default on Windows.
				fallbackpager = b'more'


				def systemrcpath():
				'''return default os-specific hgrc search path'''
				rcpath = []
				filename = win32.executablepath()
				# Use mercurial.ini found in directory with hg.exe
				progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')
				rcpath.append(progrc)
				# Use hgrc.d found in directory with hg.exe
				progrcd = os.path.join(os.path.dirname(filename), b'hgrc.d')
				if os.path.isdir(progrcd):
				for f, kind in util.listdir(progrcd):
				if f.endswith(b'.rc'):
				rcpath.append(os.path.join(progrcd, f))
				# else look for a system rcpath in the registry
				value = util.lookupreg(
				b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
				)
				if not isinstance(value, str) or not value:
				return rcpath
				value = util.localpath(value)
				for p in value.split(pycompat.ospathsep):
				if p.lower().endswith(b'mercurial.ini'):
				rcpath.append(p)
				elif os.path.isdir(p):
				for f, kind in util.listdir(p):
				if f.endswith(b'.rc'):
				rcpath.append(os.path.join(p, f))
				return rcpath


				def userrcpath():
				'''return os-specific hgrc search path to the user dir'''
				home = os.path.expanduser(b'~')
				path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]
				userprofile = encoding.environ.get(b'USERPROFILE')
				if userprofile and userprofile != home:
				path.append(os.path.join(userprofile, b'mercurial.ini'))
				path.append(os.path.join(userprofile, b'.hgrc'))
				return path


				def termsize(ui):
				return win32.termsize()