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

             bdiff.py
        
                    84 lines
            
             | 2.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / bdiff.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # bdiff.py - CFFI implementation of bdiff.c

      #

      # Copyright 2016 Maciej Fijalkowski <fijall@gmail.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 struct

      from ..pure.bdiff import *

      from . import _bdiff

      ffi = _bdiff.ffi

      lib = _bdiff.lib

      def blocks(sa, sb):

          a = ffi.new(b"struct bdiff_line**")

          b = ffi.new(b"struct bdiff_line**")

          ac = ffi.new(b"char[]", str(sa))

          bc = ffi.new(b"char[]", str(sb))

          l = ffi.new(b"struct bdiff_hunk*")

          try:

              an = lib.bdiff_splitlines(ac, len(sa), a)

              bn = lib.bdiff_splitlines(bc, len(sb), b)

              if not a[0] or not b[0]:

                  raise MemoryError

              count = lib.bdiff_diff(a[0], an, b[0], bn, l)

              if count < 0:

                  raise MemoryError

              rl = [None] * count

              h = l.next

              i = 0

              while h:

                  rl[i] = (h.a1, h.a2, h.b1, h.b2)

                  h = h.next

                  i += 1

          finally:

              lib.free(a[0])

              lib.free(b[0])

              lib.bdiff_freehunks(l.next)

          return rl

      def bdiff(sa, sb):

          a = ffi.new(b"struct bdiff_line**")

          b = ffi.new(b"struct bdiff_line**")

          ac = ffi.new(b"char[]", str(sa))

          bc = ffi.new(b"char[]", str(sb))

          l = ffi.new(b"struct bdiff_hunk*")

          try:

              an = lib.bdiff_splitlines(ac, len(sa), a)

              bn = lib.bdiff_splitlines(bc, len(sb), b)

              if not a[0] or not b[0]:

                  raise MemoryError

              count = lib.bdiff_diff(a[0], an, b[0], bn, l)

              if count < 0:

                  raise MemoryError

              rl = []

              h = l.next

              la = lb = 0

              while h:

                  if h.a1 != la or h.b1 != lb:

                      lgt = (b[0] + h.b1).l - (b[0] + lb).l

                      rl.append(

                          struct.pack(

                              b">lll",

                              (a[0] + la).l - a[0].l,

                              (a[0] + h.a1).l - a[0].l,

                              lgt,

                          )

                      )

                      rl.append(str(ffi.buffer((b[0] + lb).l, lgt)))

                  la = h.a2

                  lb = h.b2

                  h = h.next

          finally:

              lib.free(a[0])

              lib.free(b[0])

              lib.bdiff_freehunks(l.next)

          return b"".join(rl)

	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

				# bdiff.py - CFFI implementation of bdiff.c
				#
				# Copyright 2016 Maciej Fijalkowski <fijall@gmail.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 struct

				from ..pure.bdiff import *
				from . import _bdiff

				ffi = _bdiff.ffi
				lib = _bdiff.lib


				def blocks(sa, sb):
				a = ffi.new(b"struct bdiff_line**")
				b = ffi.new(b"struct bdiff_line**")
				ac = ffi.new(b"char[]", str(sa))
				bc = ffi.new(b"char[]", str(sb))
				l = ffi.new(b"struct bdiff_hunk*")
				try:
				an = lib.bdiff_splitlines(ac, len(sa), a)
				bn = lib.bdiff_splitlines(bc, len(sb), b)
				if not a[0] or not b[0]:
				raise MemoryError
				count = lib.bdiff_diff(a[0], an, b[0], bn, l)
				if count < 0:
				raise MemoryError
				rl = [None] * count
				h = l.next
				i = 0
				while h:
				rl[i] = (h.a1, h.a2, h.b1, h.b2)
				h = h.next
				i += 1
				finally:
				lib.free(a[0])
				lib.free(b[0])
				lib.bdiff_freehunks(l.next)
				return rl


				def bdiff(sa, sb):
				a = ffi.new(b"struct bdiff_line**")
				b = ffi.new(b"struct bdiff_line**")
				ac = ffi.new(b"char[]", str(sa))
				bc = ffi.new(b"char[]", str(sb))
				l = ffi.new(b"struct bdiff_hunk*")
				try:
				an = lib.bdiff_splitlines(ac, len(sa), a)
				bn = lib.bdiff_splitlines(bc, len(sb), b)
				if not a[0] or not b[0]:
				raise MemoryError
				count = lib.bdiff_diff(a[0], an, b[0], bn, l)
				if count < 0:
				raise MemoryError
				rl = []
				h = l.next
				la = lb = 0
				while h:
				if h.a1 != la or h.b1 != lb:
				lgt = (b[0] + h.b1).l - (b[0] + lb).l
				rl.append(
				struct.pack(
				b">lll",
				(a[0] + la).l - a[0].l,
				(a[0] + h.a1).l - a[0].l,
				lgt,
				)
				)
				rl.append(str(ffi.buffer((b[0] + lb).l, lgt)))
				la = h.a2
				lb = h.b2
				h = h.next

				finally:
				lib.free(a[0])
				lib.free(b[0])
				lib.bdiff_freehunks(l.next)
				return b"".join(rl)