From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 20 Dec 2012 12:14:27 +0000 (+0100)
Subject: Remove legacy code
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9b14f51a3eaf5b63dad288e092d8a083dd931ceb;p=youtube-dl

Remove legacy code
---

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index be70ec755..a7f3e1064 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -448,11 +448,6 @@ class FileDownloader(object):
         if self.params.get('writeinfojson', False):
             infofn = filename + u'.info.json'
             self.report_writeinfojson(infofn)
-            try:
-                json.dump
-            except (NameError,AttributeError):
-                self.trouble(u'ERROR: No JSON encoder found. Update to Python 2.6+, setup a json module, or leave out --write-info-json.')
-                return
             try:
                 json_info_dict = dict((k, v) for k,v in info_dict.items() if not k in ['urlhandle'])
                 write_json_file(json_info_dict, encodeFilename(infofn))