]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Remove legacy code
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Dec 2012 12:14:27 +0000 (13:14 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Dec 2012 12:14:27 +0000 (13:14 +0100)
youtube_dl/FileDownloader.py

index be70ec7557b15625506d73d5de401a9a72f9f30a..a7f3e106434fdcb486a8db63b7e886dd36cc1a09 100644 (file)
@@ -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))