From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Romain Merland" <merlorom@yahoo.fr>,
"Miguel Torroja" <miguel.torroja@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Lex Spoon" <lex@lexspoon.org>,
"Andrey Mazo" <amazo@checkvideo.com>,
"Luke Diamand" <luke@diamand.org>
Subject: [PATCH 4/6] git-p4: python3: basestring workaround
Date: Tue, 19 Jun 2018 09:04:09 +0100 [thread overview]
Message-ID: <20180619080411.6554-5-luke@diamand.org> (raw)
In-Reply-To: <20180619080411.6554-4-luke@diamand.org>
In Python3, basestring no longer exists, so use this workaround.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
git-p4.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/git-p4.py b/git-p4.py
index 67865d14aa..f127ebce27 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -27,6 +27,22 @@
import ctypes
import errno
+# support basestring in python3
+try:
+ unicode = unicode
+except NameError:
+ # 'unicode' is undefined, must be Python 3
+ str = str
+ unicode = str
+ bytes = bytes
+ basestring = (str,bytes)
+else:
+ # 'unicode' exists, must be Python 2
+ str = str
+ unicode = unicode
+ bytes = str
+ basestring = basestring
+
try:
from subprocess import CalledProcessError
except ImportError:
--
2.18.0.rc1.242.g61856ae69a
next prev parent reply other threads:[~2018-06-19 8:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-19 8:04 [PATCH 0/6] git-p4: small step towards Python3 support Luke Diamand
2018-06-19 8:04 ` [PATCH 1/6] git-p4: python3: replace <> with != Luke Diamand
2018-06-19 8:04 ` [PATCH 2/6] git-p4: python3: replace dict.has_key(k) with "k in dict" Luke Diamand
2018-06-19 8:04 ` [PATCH 3/6] git-p4: python3: remove backticks Luke Diamand
2018-06-19 8:04 ` Luke Diamand [this message]
2018-06-19 8:04 ` [PATCH 5/6] git-p4: python3: use print() function Luke Diamand
2018-06-19 8:04 ` [PATCH 6/6] git-p4: python3: fix octal constants Luke Diamand
2018-06-19 8:15 ` [PATCH 2/6] git-p4: python3: replace dict.has_key(k) with "k in dict" Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180619080411.6554-5-luke@diamand.org \
--to=luke@diamand.org \
--cc=amazo@checkvideo.com \
--cc=git@vger.kernel.org \
--cc=lex@lexspoon.org \
--cc=merlorom@yahoo.fr \
--cc=miguel.torroja@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).