summaryrefslogtreecommitdiff
path: root/psutil/_compat.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-12-15 15:43:15 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2015-12-15 15:43:15 +0100
commit9e3453c7ab982ed699e7caddedb4169e62d8fe7f (patch)
treebdaf3441514efcab631bf4bf8aea39354649c37d /psutil/_compat.py
parent29334f12ae2d96ff175fae8de65d0e5760b4d3b9 (diff)
downloadpsutil-9e3453c7ab982ed699e7caddedb4169e62d8fe7f.tar.gz
#717: ignore everything after the first occurrence of '\x00' instead of replacing '\x00' for the whole string
Diffstat (limited to 'psutil/_compat.py')
-rw-r--r--psutil/_compat.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/psutil/_compat.py b/psutil/_compat.py
index 18b2e85d..9062ec97 100644
--- a/psutil/_compat.py
+++ b/psutil/_compat.py
@@ -17,6 +17,7 @@ if PY3:
long = int
xrange = range
unicode = str
+ basestring = str
def u(s):
return s
@@ -27,6 +28,7 @@ else:
long = long
xrange = xrange
unicode = unicode
+ basestring = basestring
def u(s):
return unicode(s, "unicode_escape")