Merge branch 'merge_1' into edumed

[redakcja.git] / apps / cover / forms.py

diff --git a/apps/cover/forms.py b/apps/cover/forms.py
index fab0bb6..d726f1f 100755 (executable)
--- a/apps/cover/forms.py
+++ b/apps/cover/forms.py
@@ -38,7 +38,7 @@ class FlickrForm(forms.Form):
 
     def clean_source_url(self):
         url = self.cleaned_data['source_url']
 
     def clean_source_url(self):
         url = self.cleaned_data['source_url']

-        m = re.match(r'(https?://)?(www.)?flickr.com/photos/(?P<author>[^/]+)/(?P<img>\d+)', url)
+        m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P<author>[^/]+)/(?P<img>\d+)/?', url)

         if not m:
             raise forms.ValidationError("It doesn't look like Flickr URL.")
         author_slug, img_id = m.group('author'), m.group('img')
         if not m:
             raise forms.ValidationError("It doesn't look like Flickr URL.")
         author_slug, img_id = m.group('author'), m.group('img')