From 5afb1f0917214697045c904c6af4fe2ddf43818f Mon Sep 17 00:00:00 2001 From: Christopher Rosell Date: Wed, 23 May 2012 02:53:47 +0200 Subject: Simplify Python compat. --- src/livestreamer/compat.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/livestreamer/compat.py b/src/livestreamer/compat.py index c0d798e..48a6718 100644 --- a/src/livestreamer/compat.py +++ b/src/livestreamer/compat.py @@ -2,22 +2,18 @@ import sys -orig_str = str +is_py2 = (sys.version_info[0] == 2) +is_py3 = (sys.version_info[0] == 3) -def str(s, enc="ascii"): - if sys.version_info[0] == 3: - return orig_str(s, enc) - else: - return orig_str(s) +if is_py2: + str = unicode + def bytes(b, enc="ascii"): + return str(b) -orig_bytes = bytes - -def bytes(s, enc="ascii"): - if sys.version_info[0] == 3: - return orig_bytes(s, enc) - else: - return orig_bytes(s) +elif is_py3: + str = str + bytes = bytes try: import urllib.request as urllib @@ -25,6 +21,6 @@ except ImportError: import urllib2 as urllib try: - from urllib.parse import urlparse + from urllib.parse import urlparse, parse_qs except ImportError: - from urlparse import urlparse + from urlparse import urlparse, parse_qs -- cgit v1.2.3