Browse Source

fix lib.py

Arnau Sanchez 10 years ago
parent
commit
3d24e46896
3 changed files with 6 additions and 4 deletions
  1. 4 2
      youtube_upload/lib.py
  2. 1 1
      youtube_upload/main.py
  3. 1 1
      youtube_upload/upload_video.py

+ 4 - 2
youtube_upload/lib.py

@@ -1,5 +1,7 @@
 import sys
 import sys
 import locale
 import locale
+import random
+import time
 
 
 def to_utf8(s):
 def to_utf8(s):
     """Re-encode string from the default system encoding to UTF-8."""
     """Re-encode string from the default system encoding to UTF-8."""
@@ -49,10 +51,10 @@ def retriable_exceptions(fun, retriable_exceptions, max_retries=None):
             if type(exc) not in retriable_exceptions:
             if type(exc) not in retriable_exceptions:
                 raise exc
                 raise exc
             elif max_retries is not None and retry > max_retries:
             elif max_retries is not None and retry > max_retries:
-                lib.debug("Retry limit reached, time to give up")
+                debug("Retry limit reached, time to give up")
                 raise exc
                 raise exc
             else:
             else:
                 seconds = random.uniform(0, 2**retry)
                 seconds = random.uniform(0, 2**retry)
-                lib.debug("Retryable error {0}/{1}: {2}. Waiting {3} seconds".
+                debug("Retryable error {0}/{1}: {2}. Waiting {3} seconds".
                     format(retry, max_retries or "-", type(exc).__name__, seconds))
                     format(retry, max_retries or "-", type(exc).__name__, seconds))
                 time.sleep(seconds)
                 time.sleep(seconds)

+ 1 - 1
youtube_upload/main.py

@@ -145,7 +145,7 @@ def main(arguments):
     parser.add_option('', '--privacy', dest='privacy', metavar="STRING",
     parser.add_option('', '--privacy', dest='privacy', metavar="STRING",
         default="public", help='Privacy status (public | unlisted | private)')
         default="public", help='Privacy status (public | unlisted | private)')
     parser.add_option('', '--location', dest='location', type="string",
     parser.add_option('', '--location', dest='location', type="string",
-        default=None, metavar="latitude=VAL, longitude=VAL, altitude=VAL",
+        default=None, metavar="latitude=VAL,longitude=VAL[,altitude=VAL]",
         help='Video(s) location"')
         help='Video(s) location"')
     parser.add_option('', '--title-template', dest='title_template',
     parser.add_option('', '--title-template', dest='title_template',
         type="string", default="{title} [{n}/{total}]", metavar="STRING",
         type="string", default="{title} [{n}/{total}]", metavar="STRING",

+ 1 - 1
youtube_upload/upload_video.py

@@ -32,7 +32,7 @@ def upload(resource, path, body, chunksize=int(1e6), progress_callback=None):
     """Upload video to Youtube. Return video ID."""
     """Upload video to Youtube. Return video ID."""
     body_keys = ",".join(body.keys())
     body_keys = ",".join(body.keys())
     media = apiclient.http.MediaFileUpload(path, chunksize=chunksize, 
     media = apiclient.http.MediaFileUpload(path, chunksize=chunksize, 
-      resumable=True, mimetype="application/octet-stream")
+        resumable=True, mimetype="application/octet-stream")
     request = resource.videos().insert(part=body_keys, body=body, media_body=media)
     request = resource.videos().insert(part=body_keys, body=body, media_body=media)
     upload_fun = lambda: _upload_to_request(request, progress_callback)
     upload_fun = lambda: _upload_to_request(request, progress_callback)
     return lib.retriable_exceptions(upload_fun, RETRIABLE_EXCEPTIONS, max_retries=10)
     return lib.retriable_exceptions(upload_fun, RETRIABLE_EXCEPTIONS, max_retries=10)