From: Ben Keene <seraphire@xxxxxxxxx>
Python 3 handles strings differently than Python 2.7. Since Python 2
is reaching it's end of life, a series of changes are being submitted to
enable python 3.5 and following support. The current code fails basic
tests under python 3.5.
Change the existing unicode test add new support functions for
Python 2 - Python 3 support.
Define the following variables:
- isunicode - a boolean variable that states if the version of python
natively supports unicode (true) or not (false). This is
true for Python 3 and false for Python 2.
- unicode - a type alias for the datatype that holds a unicode string.
It is assigned to a str under Python 3 and the unicode
type for Python 2.
- bytes - a type alias for an array of bytes. It is assigned the
native bytes type for Python 3 and str for Python 2.
Add the following new functions:
- as_string(text) - A new function that will convert a byte array to a
unicode (UTF-8) string under Python 3. Under
Python 2, this returns the string unchanged.
- as_bytes(text) - A new function that will convert a unicode string
to a byte array under Python 3. Under Python 2,
this returns the string unchanged.
- to_unicode(text) - Converts a text string as Unicode(UTF-8) on both
Python 2 and Python 3.
Add a new function alias raw_input:
If raw_input does not exist (it was renamed to input in Python 3) alias
input as raw_input.
The as_string() and as_bytes() functions allow for modifying the code
with a minimal amount of impact on Python 2 support. When a string is
expected, the as_string() will be used to "cast" the incoming "bytes"
to a string type.
Conversely as_bytes() will be used to cast a "string" to a "byte array"
type. Since Python 2 overloads the datatype 'str' to serve both purposes,
the Python 2 versions of these function do not change the data. This
reduces the regression impact of these code changes.
'basestring' is removed since its only references are found in tests
that were changed in modified in previous commits.
Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
---
git-p4.py | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 74 insertions(+), 6 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index e020958083..e6f7513384 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -32,16 +32,84 @@
unicode = unicode
except NameError:
# 'unicode' is undefined, must be Python 3
- str = str
+ #
+ # For Python 3 which is natively unicode, we will use
+ # unicode for internal information but all P4 Data
+ # will remain in bytes
+ isunicode = True
unicode = str
bytes = bytes
- basestring = (str,bytes)
+
+ def as_string(text):
+ """ Return a byte array as a unicode string
+ """
+ if text is None:
+ return None
+ if isinstance(text, bytes):
+ return unicode(text, "utf-8")
+ else:
+ return text
+
+ def as_bytes(text):
+ """ Return a Unicode string as a byte array
+ """
+ if text is None:
+ return None
+ if isinstance(text, bytes):
+ return text
+ else:
+ return bytes(text, "utf-8")
+
+ def to_unicode(text):
+ """ Return a byte array as a unicode string
+ """
+ return as_string(text)
+
+ def path_as_string(path):
+ """ Converts a path to the UTF8 encoded string
+ """
+ if isinstance(path, unicode):
+ return path
+ return encodeWithUTF8(path).decode('utf-8')
+
else:
# 'unicode' exists, must be Python 2
- str = str
+ #
+ # We will treat the data as:
+ # str -> str
+ # bytes -> str
+ # So for Python 2 these functions are no-ops
+ # and will leave the data in the ambiguious
+ # string/bytes state
+ isunicode = False
unicode = unicode
bytes = str
- basestring = basestring
+
+ def as_string(text):
+ """ Return text unaltered (for Python 3 support)
+ """
+ return text
+
+ def as_bytes(text):
+ """ Return text unaltered (for Python 3 support)
+ """
+ return text
+
+ def to_unicode(text):
+ """ Return a string as a unicode string
+ """
+ return text.decode('utf-8')
+
+ def path_as_string(path):
+ """ Converts a path to the UTF8 encoded bytes
+ """
+ return encodeWithUTF8(path)
+
+# Check for raw_input support
+try:
+ raw_input
+except NameError:
+ raw_input = input
try:
from subprocess import CalledProcessError
@@ -740,7 +808,7 @@ def p4Where(depotPath):
if data[:space] == depotPath:
output = entry
break
- if output == None:
+ if output is None:
return ""
if output["code"] == "error":
return ""
@@ -4175,7 +4243,7 @@ def main():
global verbose
verbose = cmd.verbose
if cmd.needsGit:
- if cmd.gitdir == None:
+ if cmd.gitdir is None:
cmd.gitdir = os.path.abspath(".git")
if not isValidGitDir(cmd.gitdir):
# "rev-parse --git-dir" without arguments will try $PWD/.git
--
gitgitgadget
