diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-11-06 17:14:18 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-11-06 17:14:18 +0100 |
commit | 4cffa4ce9cc900cb3a5f547deb06f46101d0a90b (patch) | |
tree | 9cc6d63c8a1ad3d0a1b6c0cb20e5e7f1b600d87a /psutil/_compat.py | |
parent | c83bca37349952a5d5c0d437d1649afb78c9a0ca (diff) | |
parent | afd4e5b0957b27c2121a8c37a893fdd9d40bae1c (diff) | |
download | psutil-4cffa4ce9cc900cb3a5f547deb06f46101d0a90b.tar.gz |
merge from master
Diffstat (limited to 'psutil/_compat.py')
-rw-r--r-- | psutil/_compat.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/psutil/_compat.py b/psutil/_compat.py index 3d984998..f79af3ac 100644 --- a/psutil/_compat.py +++ b/psutil/_compat.py @@ -20,6 +20,9 @@ if PY3: def u(s): return s + + def b(s): + return s.encode("latin-1") else: long = long xrange = xrange @@ -28,6 +31,9 @@ else: def u(s): return unicode(s, "unicode_escape") + def b(s): + return s + # removed in 3.0, reintroduced in 3.2 try: |