diff options
author | Christopher Rosell <chrippa@tanuki.se> | 2012-08-25 15:14:56 +0200 |
---|---|---|
committer | Christopher Rosell <chrippa@tanuki.se> | 2012-08-25 15:14:56 +0200 |
commit | b854a388135782a80ce00329aa0f4e1e32d47bec (patch) | |
tree | 83ba2bf18b2a81fa860e2f3d996acba612be0792 /src/livestreamer/compat.py | |
parent | 91363e5628dd30e34ab254c619246a298333f8bc (diff) |
livestreamer.plugins.gomtv: A few tweaks and fixes.
- Python 3.x compatible.
- Fix cookie handling.
- Remove unused methods and variables.
- Coding style tweaks.
Diffstat (limited to 'src/livestreamer/compat.py')
-rw-r--r-- | src/livestreamer/compat.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/livestreamer/compat.py b/src/livestreamer/compat.py index 61711fb..f023bd8 100644 --- a/src/livestreamer/compat.py +++ b/src/livestreamer/compat.py @@ -7,10 +7,11 @@ is_win32 = os.name == "nt" if is_py2: input = raw_input stdout = sys.stdout + _str = str str = unicode def bytes(b, enc="ascii"): - return str(b) + return _str(b) elif is_py3: bytes = bytes @@ -25,9 +26,13 @@ except ImportError: try: from urllib.parse import urlparse, parse_qs, urlencode + import http.cookies as cookies + import http.cookiejar as cookiejar except ImportError: from urlparse import urlparse, parse_qs from urllib import urlencode + import Cookie as cookies + import cookielib as cookiejar __all__ = ["is_py2", "is_py3", "is_win32", "input", "stdout", "str", - "bytes", "urllib", "urlparse", "parse_qs"] + "bytes", "urllib", "urlparse", "parse_qs", "cookies", "cookiejar"] |