Merge lp:~dooferlad/linaro-license-protection/unicode-fix into lp:~linaro-automation/linaro-license-protection/trunk

[James Tunnicliffe]

Convert possibly unicode containing IRIs into URIs before handling them.

[Stevan Radaković (stevanr)]

Looks good.
Approve +1

review: Approve

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2013-04-02 09:58:42 +0000
+++ license_protected_downloads/views.py	2013-04-05 09:49:30 +0000
@@ -17,7 +17,7 @@
 )
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
-from django.utils.encoding import smart_str
+from django.utils.encoding import smart_str, iri_to_uri
 
 import bzr_version
 from buildinfo import BuildInfo, IncorrectDataFormatException
@@ -394,6 +394,7 @@
 
 def file_server(request, path):
     """Serve up a file / directory listing or license page as required"""
+    path = iri_to_uri(path)
     url = path
     result = test_path(path)
     if not result:
@@ -511,6 +512,7 @@
 
 
 def list_files_api(request, path):
+    path = iri_to_uri(path)
     url = path
     result = test_path(path)
     if not result:
@@ -554,6 +556,7 @@
 
 
 def get_license_api(request, path):
+    path = iri_to_uri(path)
     result = test_path(path)
     if not result:
         raise Http404