Replace long with int (see PEP 237)

[youtube-dl] / youtube_dl / __init__.py

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 92478aa6bb71d2b3a92127eb9e1877ec4eb813dd..54c7d7f72ed82051ad738f2039c9017ae9d58ad9 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -18,10 +18,11 @@ __authors__  = (
        'Ori Avtalion',
        'shizeeg',
        'Filippo Valsorda',
+       'Christian Albrecht',
        )
 
 __license__ = 'Public Domain'
-__version__ = '2012.11.28'
+__version__ = '2012.11.29'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
 UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'
@@ -126,9 +127,12 @@ def parseOpts():
 
                opts = []
 
-               if option._short_opts: opts.append(option._short_opts[0])
-               if option._long_opts: opts.append(option._long_opts[0])
-               if len(opts) > 1: opts.insert(1, ', ')
+               if option._short_opts:
+                       opts.append(option._short_opts[0])
+               if option._long_opts:
+                       opts.append(option._long_opts[0])
+               if len(opts) > 1:
+                       opts.insert(1, ', ')
 
                if option.takes_value(): opts.append(' %s' % option.metavar)
 
@@ -367,7 +371,7 @@ def gen_extractors():
                YoukuIE(),
                XNXXIE(),
                GooglePlusIE(),
-
+               ArteTvIE(),
                GenericIE()
        ]
 
@@ -445,7 +449,7 @@ def _real_main():
                opts.ratelimit = numeric_limit
        if opts.retries is not None:
                try:
-                       opts.retries = long(opts.retries)
+                       opts.retries = int(opts.retries)
                except (TypeError, ValueError), err:
                        parser.error(u'invalid retry count specified')
        if opts.buffersize is not None: