|
@ -22,8 +22,10 @@ __version__ = '2012.01.08b' |
|
|
|
|
|
|
|
|
UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' |
|
|
UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cookielib |
|
|
import cookielib |
|
|
import datetime |
|
|
import datetime |
|
|
|
|
|
import getpass |
|
|
import gzip |
|
|
import gzip |
|
|
import htmlentitydefs |
|
|
import htmlentitydefs |
|
|
import HTMLParser |
|
|
import HTMLParser |
|
@ -31,9 +33,11 @@ import httplib |
|
|
import locale |
|
|
import locale |
|
|
import math |
|
|
import math |
|
|
import netrc |
|
|
import netrc |
|
|
|
|
|
import optparse |
|
|
import os |
|
|
import os |
|
|
import os.path |
|
|
import os.path |
|
|
import re |
|
|
import re |
|
|
|
|
|
import shlex |
|
|
import socket |
|
|
import socket |
|
|
import string |
|
|
import string |
|
|
import subprocess |
|
|
import subprocess |
|
@ -4205,11 +4209,6 @@ def updateSelf(downloader, filename): |
|
|
downloader.to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.') |
|
|
downloader.to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.') |
|
|
|
|
|
|
|
|
def parseOpts(): |
|
|
def parseOpts(): |
|
|
# Deferred imports |
|
|
|
|
|
import getpass |
|
|
|
|
|
import optparse |
|
|
|
|
|
import shlex |
|
|
|
|
|
|
|
|
|
|
|
def _readOptions(filename_bytes): |
|
|
def _readOptions(filename_bytes): |
|
|
try: |
|
|
try: |
|
|
optionf = open(filename_bytes) |
|
|
optionf = open(filename_bytes) |
|
|