Revision: 7334
Author: multichill
Date: 2009-09-29 17:45:35 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Fix to get previous commit working
Modified Paths:
--------------
trunk/pywikipedia/flickrripper.py
Modified: trunk/pywikipedia/flickrripper.py
===================================================================
--- trunk/pywikipedia/flickrripper.py 2009-09-29 17:35:17 UTC (rev 7333)
+++ trunk/pywikipedia/flickrripper.py 2009-09-29 17:45:35 UTC (rev 7334)
@@ -203,6 +203,9 @@
'''
description = flinfoDescription
+ if(removeCategories):
+ description = wikipedia.removeCategoryLinks(text=description,
site=wikipedia.getSite(u'commons', u'commons'))
+
if(override):
description = description.replace(u'{{cc-by-sa-2.0}}\n', u'')
description = description.replace(u'{{cc-by-2.0}}\n', u'')
@@ -551,7 +554,7 @@
if user_id or group_id or photoset_id:
for photo_id in getPhotos(flickr=flickr, user_id=user_id, group_id=group_id,
photoset_id=photoset_id, start_id=start_id, end_id=end_id, tags=tags):
- uploadedPhotos = uploadedPhotos + processPhoto(flickr=flickr,
photo_id=photo_id, flickrreview=flickrreview, reviewer=reviewer, override=override,
addCategory=addCategory, removeCategories=removeCategories, autonomous=autonomous):
+ uploadedPhotos = uploadedPhotos + processPhoto(flickr=flickr,
photo_id=photo_id, flickrreview=flickrreview, reviewer=reviewer, override=override,
addCategory=addCategory, removeCategories=removeCategories, autonomous=autonomous)
totalPhotos = totalPhotos + 1
else:
usage()