mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 03:06:13 +02:00
Code

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>
This commit is contained in:
Brandon Casey 2013-01-26 11:14:32 -08:00 committed by Junio C Hamano
parent 5d417842ef
commit 598354c0ad
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -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
View File

@ -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):