fix broken tests

Author: chfw

pyramid_excel/__init__.py

@@ -64,11 +64,11 @@ def _make_response(content, content_type, status, file_name=None):
     if file_name:
         if PY2_VERSION and isinstance(file_name, unicode):
             file_name = file_name.encode('utf-8')
-            url_encoded_file_name = urllib_quote(file_name)
-            response.content_disposition = (
-                "attachment; filename=%s;filename*=utf-8''%s"
-                % (url_encoded_file_name, url_encoded_file_name)
-            )
+        url_encoded_file_name = urllib_quote(file_name)
+        response.content_disposition = (
+            "attachment; filename=%s;filename*=utf-8''%s"
+            % (url_encoded_file_name, url_encoded_file_name)
+        )
     return response
 
 

tests/test_upload_n_download_excel.py

@@ -81,13 +81,13 @@ def test_download_file_name_in_unicode_in_string(self):
 
     def _download_and_verify_file_name(self, test_file_name):
         for file_type in FILE_TYPE_MIME_TABLE.keys():
+            url_encoded_file_name = urllib_quote(test_file_name)
             response = self.app.get(
-                '/download/%s/%s' % (test_file_name, file_type))
+                '/download/%s/%s' % (url_encoded_file_name, file_type))
             eq_(response.content_type,
                 FILE_TYPE_MIME_TABLE[file_type])
-            url_encoded_file_name = urllib_quote(test_file_name)
             expected = (
                 "attachment; filename=%s.%s;filename*=utf-8''%s.%s"
                 % (url_encoded_file_name, file_type,
                    url_encoded_file_name, file_type))
-            assert response.content_disposition == expected
+            eq_(response.content_disposition, expected)