aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/livestreamer/compat.py
diff options
context:
space:
mode:
authorGravatar Christopher Rosell <chrippa@tanuki.se>2012-08-25 04:03:37 -0700
committerGravatar Christopher Rosell <chrippa@tanuki.se>2012-08-25 04:03:37 -0700
commit91363e5628dd30e34ab254c619246a298333f8bc (patch)
tree2f2d8f74a194a4c5012a3254b58404c79f7e18a5 /src/livestreamer/compat.py
parent8545ee9aec203c0fcbeb64810022a3018e1590d4 (diff)
parent550257a2a0b3c2fa4e427cb5a0a6c75e4b727179 (diff)
Merge pull request #21 from niallm90/plugin-gomtv
GOMTV.net plugin
Diffstat (limited to 'src/livestreamer/compat.py')
-rw-r--r--src/livestreamer/compat.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/livestreamer/compat.py b/src/livestreamer/compat.py
index 5bc1c3c..61711fb 100644
--- a/src/livestreamer/compat.py
+++ b/src/livestreamer/compat.py
@@ -24,9 +24,10 @@ except ImportError:
import urllib2 as urllib
try:
- from urllib.parse import urlparse, parse_qs
+ from urllib.parse import urlparse, parse_qs, urlencode
except ImportError:
from urlparse import urlparse, parse_qs
+ from urllib import urlencode
__all__ = ["is_py2", "is_py3", "is_win32", "input", "stdout", "str",
"bytes", "urllib", "urlparse", "parse_qs"]