Start preparing new release.

[youtubedl] / youtube_dl / extractor / camdemy.py

diff --git a/youtube_dl/extractor/camdemy.py b/youtube_dl/extractor/camdemy.py
index 268c34392468e1b145e893a55496ad7bbb728d41..8f0c6c545c35312813bb461b3218f868a660fdd2 100644 (file)
--- a/youtube_dl/extractor/camdemy.py
+++ b/youtube_dl/extractor/camdemy.py
@@ -26,7 +26,7 @@ class CamdemyIE(InfoExtractor):
             'id': '5181',
             'ext': 'mp4',
             'title': 'Ch1-1 Introduction, Signals (02-23-2012)',
             'id': '5181',
             'ext': 'mp4',
             'title': 'Ch1-1 Introduction, Signals (02-23-2012)',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'creator': 'ss11spring',
             'duration': 1591,
             'upload_date': '20130114',
             'creator': 'ss11spring',
             'duration': 1591,
             'upload_date': '20130114',


@@ -41,7 +41,7 @@ class CamdemyIE(InfoExtractor):
             'id': '13885',
             'ext': 'mp4',
             'title': 'EverCam + Camdemy QuickStart',
             'id': '13885',
             'ext': 'mp4',
             'title': 'EverCam + Camdemy QuickStart',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',
             'creator': 'evercam',
             'duration': 318,
             'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',
             'creator': 'evercam',
             'duration': 318,


@@ -112,7 +112,7 @@ class CamdemyIE(InfoExtractor):
 
 
 class CamdemyFolderIE(InfoExtractor):
 
 
 class CamdemyFolderIE(InfoExtractor):

-    _VALID_URL = r'https?://www.camdemy.com/folder/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?camdemy\.com/folder/(?P<id>\d+)'

     _TESTS = [{
         # links with trailing slash
         'url': 'http://www.camdemy.com/folder/450',
     _TESTS = [{
         # links with trailing slash
         'url': 'http://www.camdemy.com/folder/450',