[cc-commits] [CC SVN] r12324 - in planet/branches/production: . software/filters

webmaster at creativecommons.org webmaster at creativecommons.org
Tue Apr 21 18:13:03 EDT 2009


Author: nyergler
Date: 2009-04-21 22:13:02 +0000 (Tue, 21 Apr 2009)
New Revision: 12324

Modified:
   planet/branches/production/
   planet/branches/production/software/filters/get_license_name.plugin
Log:
Merged revisions 12323 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/planet/trunk

........
  r12323 | nyergler | 2009-04-21 15:12:13 -0700 (Tue, 21 Apr 2009) | 2 lines
  
  un-url-quote the license_url before we attempt to process it.
........



Property changes on: planet/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
   - /planet/trunk:1-9155,9157,9160-9161,9163,9535,9842,9844,9897,10187-10188,10190
   + /planet/trunk:1-12323

Modified: planet/branches/production/software/filters/get_license_name.plugin
===================================================================
--- planet/branches/production/software/filters/get_license_name.plugin	2009-04-21 22:12:13 UTC (rev 12323)
+++ planet/branches/production/software/filters/get_license_name.plugin	2009-04-21 22:13:02 UTC (rev 12324)
@@ -22,6 +22,7 @@
 import sys
 import os
 import pickle
+import urllib
 import urllib2
 import urlparse
 from xml.dom import minidom
@@ -41,6 +42,10 @@
 def get_license_text(license_url):
     """Try to fetch license name associcated with the passed URL."""
     log.debug('Entered function get_license_text()')
+
+    # some blog plugins erroneously urlquote the license URL
+    license_url = urllib.unquote(license_url)
+
     try:
         # Try to fetch some data about this license
         log.debug('Trying to fetch URL ' + license_url)




More information about the cc-commits mailing list