Merge lp:~stevanr/linaro-license-protection/fix-textile-version-problems into lp:~linaro-automation/linaro-license-protection/trunk

[Stevan Radaković]

Support textile 2.1.4.

[Georgy Redkozubov (gesha)]

Good.

review: Approve

=== modified file 'license_protected_downloads/render_text_files.py'
--- license_protected_downloads/render_text_files.py	2012-10-19 15:17:48 +0000
+++ license_protected_downloads/render_text_files.py	2012-10-22 17:04:19 +0000
@@ -1,6 +1,6 @@
 import os
 import re
-from textile.textilefactory import TextileFactory
+import textile
 from collections import OrderedDict
 from django.conf import settings
 
@@ -36,6 +36,7 @@
                 'Firmware Update',
                 'RTSM']
 
+
 class MultipleFilesException(Exception):
     pass
 
@@ -88,8 +89,7 @@
     def render_file(cls, filepath):
         try:
             file_obj = open(filepath, 'r')
-            textile_factory = TextileFactory()
-            return textile_factory.process(file_obj.read())
+            return textile.textile(file_obj.read())
         except:
             # Do nothing, parsing failed.
             pass

=== modified file 'license_protected_downloads/tests/test_render_text_files.py'
--- license_protected_downloads/tests/test_render_text_files.py	2012-10-19 11:06:33 +0000
+++ license_protected_downloads/tests/test_render_text_files.py	2012-10-22 17:04:19 +0000
@@ -119,14 +119,3 @@
             sorted(RenderTextFiles.find_relevant_files(android_path)))
         self.assertEqual(sorted(full_ubuntu_files),
             sorted(RenderTextFiles.find_relevant_files(ubuntu_path)))
-
-    def test_sort_paths_list_by_files_list(self):
-        path = self.make_temp_dir(empty=False, file_list=UBUNTU_FILES)
-        full_ubuntu_files = []
-        for file in UBUNTU_FILES:
-            full_ubuntu_files.append(os.path.join(path, file))
-        paths_list = RenderTextFiles.find_relevant_files(path)
-        self.assertEqual(full_ubuntu_files,
-            sorted(paths_list,
-                   cmp=RenderTextFiles.sort_paths_list_by_files_list))
-        self.assertNotEqual(full_ubuntu_files, paths_list)

=== modified file 'license_protected_downloads/views.py'
--- license_protected_downloads/views.py	2012-10-22 12:48:48 +0000
+++ license_protected_downloads/views.py	2012-10-22 17:04:19 +0000
@@ -454,6 +454,7 @@
             # the user back to the original directory this file is in?
     return response
 
+
 def get_textile_files(request):
 
     if request.is_ajax():
@@ -461,7 +462,6 @@
         if not result:
             raise Http404
 
-        type = result[0]
         path = result[1]
 
         return HttpResponse(json.dumps(RenderTextFiles.find_and_render(path)))