Browse Source

git-p4.py: support Python 2.5

Python 2.5 and older do not accept None as the first argument to
translate() and complain with:

   TypeError: expected a character buffer object

As suggested by Pete Wyckoff, let's just replace the call to translate()
with a regex search which should be more clear and more portable.

This allows git-p4 to be used with Python 2.5.

Signed-off-by: Brandon Casey <bcasey@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Casey 12 years ago committed by Junio C Hamano
parent
commit
598354c0ad
  1. 2
      INSTALL
  2. 3
      git-p4.py

2
INSTALL

@ -131,7 +131,7 @@ Issues of note: @@ -131,7 +131,7 @@ Issues of note:
use English. Under autoconf the configure script will do this
automatically if it can't find libintl on the system.

- Python version 2.6 or later is needed to use the git-p4
- Python version 2.5 or later is needed to use the git-p4
interface to Perforce.

- Some platform specific issues are dealt with Makefile rules,

3
git-p4.py

@ -742,7 +742,8 @@ def wildcard_encode(path): @@ -742,7 +742,8 @@ def wildcard_encode(path):
return path

def wildcard_present(path):
return path.translate(None, "*#@%") != path
m = re.search("[*#@%]", path)
return m is not None

class Command:
def __init__(self):

Loading…
Cancel
Save