jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/575014 )
Change subject: update flickr license info
......................................................................
update flickr license info
Change-Id: Ib62f2f0ae9e3c02a691dac3bddec218b29ed147c
---
M scripts/flickrripper.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py
index 904525d..5b91da4 100755
--- a/scripts/flickrripper.py
+++ b/scripts/flickrripper.py
@@ -52,7 +52,7 @@
except ImportError as e:
flickrapi = e
-
+# see
https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html
flickr_allowed_license = {
0: False, # All Rights Reserved
1: False, # Creative Commons Attribution-NonCommercial-ShareAlike License
@@ -63,6 +63,8 @@
6: False, # Creative Commons Attribution-NoDerivs License
7: True, # No known copyright restrictions
8: True, # United States Government Work
+ 9: True, # Public Domain Dedication (CC0)
+ 10: True, # Public Domain Mark
}
--
To view, visit
https://gerrit.wikimedia.org/r/575014
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib62f2f0ae9e3c02a691dac3bddec218b29ed147c
Gerrit-Change-Number: 575014
Gerrit-PatchSet: 4
Gerrit-Owner: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Shizhao <shizhao(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)