diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-05-01 17:01:51 +0200 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2012-05-01 17:01:51 +0200 |
| commit | 921a14559277cfb2ead84b613c02d0251aeeb9ab (patch) | |
| tree | 28fec3a3a15d409323250ad6e07f86d06b6b5e9d /youtube_dl/utils.py | |
| parent | 9beb5af82ecfbb35ee534692e73fb38f4399698a (diff) | |
| download | youtube-dl-921a14559277cfb2ead84b613c02d0251aeeb9ab.tar.xz | |
dropped the support for Python 2.5
let's elaborate the decision: Python 2.5 is a 6 years old release
and "under the current release policy, no security issues in Python
2.5 will be fixed anymore" (!!); also, it doesn't support the new
zipfile distribution format.
Diffstat (limited to 'youtube_dl/utils.py')
| -rw-r--r-- | youtube_dl/utils.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 0f903c64a..6e982157c 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -11,16 +11,12 @@ import sys import zlib import urllib2 import email.utils +import json try: import cStringIO as StringIO except ImportError: import StringIO - -try: - import json -except ImportError: # Python <2.6, use trivialjson (https://github.com/phihag/trivialjson): - import trivialjson as json std_headers = { 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1', |