use utf8

youtube_upload/categories.py

@@ -39,10 +39,9 @@ IDS = {
 }
 
 def get(region_code="us", api_key=None):
-    params = urllib.urlencode(dict(part="snippet", regionCode=region_code, key=api_key))
-    full_url = URL + "?" + params
+    params = dict(part="snippet", regionCode=region_code, key=api_key)  
+    full_url = URL + "?" + urllib.urlencode(params)
     response = urllib2.urlopen(full_url)
     categories_info = json.loads(response.read())
     items = categories_info["items"]
-    categories = dict((item["snippet"]["title"], item["id"]) for item in items)
-    return categories
+    return dict((item["snippet"]["title"], item["id"]) for item in items)

youtube_upload/lib.py

@@ -12,8 +12,6 @@ def default_sigint():
     signal.signal(signal.SIGINT, signal.SIG_DFL)
     try:
         yield
-    except:
-        raise
     finally:
         signal.signal(signal.SIGINT, original_sigint_handler)
         
@@ -72,7 +70,7 @@ def retriable_exceptions(fun, retriable_exceptions, max_retries=None):
             if type(exc) not in retriable_exceptions:
                 raise exc
             elif max_retries is not None and retry > max_retries:
-                debug("Retry limit reached, time to give up")
+                debug("[Retryable errors] Retry limit reached")
                 raise exc
             else:
                 seconds = random.uniform(0, 2**retry)

youtube_upload/main.py

@@ -78,7 +78,7 @@ def get_category_id(category):
     if category:
         if category in youtube_upload.categories.IDS:
             ncategory = youtube_upload.categories.IDS[category]
-            debug("Using category ID: {0} ({1})".format(category, ncategory))
+            debug("Using category: {0} (id={1})".format(category, ncategory))
             return str(youtube_upload.categories.IDS[category])
         else:
             msg = "{0} is not a valid category".format(category)
@@ -86,9 +86,11 @@ def get_category_id(category):
 
 def upload_video(youtube, options, video_path, total_videos, index):
     """Upload video with index (for split videos)."""
-    title = lib.to_utf8(options.title)
-    description = lib.to_utf8(options.description or "").decode("string-escape")
-    ns = dict(title=title, n=index+1, total=total_videos)
+    u = lib.to_utf8
+    title = u(options.title)
+    description = u(options.description or "").decode("string-escape")
+    tags = [u(s.strip()) for s in (options.tags or "").split(",")]
+    ns = dict(title=u(options.title), n=index+1, total=total_videos)
     complete_title = \
         (options.title_template.format(**ns) if total_videos > 1 else title)
     progress = get_progress_info()
@@ -98,7 +100,7 @@ def upload_video(youtube, options, video_path, total_videos, index):
             "title": complete_title,
             "description": description,
             "categoryId": category_id,
-            "tags": [s.strip() for s in (options.tags or "").split(",")],
+            "tags": tags,
         },
         "status": {
             "privacyStatus": options.privacy,
@@ -108,7 +110,7 @@ def upload_video(youtube, options, video_path, total_videos, index):
         },
     }
 
-    debug("Start upload: {0} ({1})".format(video_path, complete_title))
+    debug("Start upload: {0}".format(video_path))
     try:
         video_id = youtube_upload.upload_video.upload(youtube, video_path, 
             request_body, progress_callback=progress.callback)