Create a temp function to handle multiple 'license_text_file'

Author: chinyeungli

about_code_tool/about.py

@@ -20,6 +20,7 @@
 import csv
 from datetime import datetime
 from email.parser import HeaderParser
+from os.path import dirname, join
 import errno
 import httplib
 import logging
@@ -749,7 +750,6 @@ def validate_about_resource_exist(self):
                 self.errors.append(Error(FILE, about_resource,
                                          self.about_resource,
                                          'File does not exist.'))
-
         self._save_location(about_resource, self.about_resource)
 
     def validate_file_field_exists(self, field_name, file_path):
@@ -974,6 +974,20 @@ def duplicate_file_names_when_lowercased(file_location):
                 names.append(name)
         return names
 
+    def tmp_get_license_text(self):
+        # TODO: This is a temp fix for handling multiple 'license_text_file'
+        # The code should get the license text from the def license_text(self),
+        # not this function.
+        license_text = ""
+        licenses = self.parsed.get('license_text_file', '')
+        license_list = licenses.split('\n ')
+        for lic in license_list:
+            location = join(dirname(self.location), lic)
+            with open(location, 'rU') as f:
+                license_text += f.read()
+                license_text += '\n\n\n\n\n\n'
+        return license_text
+
     def license_text(self):
         """
         Return the license text if the license_text_file field exists and the
@@ -1175,12 +1189,19 @@ def generate_attribution(self, template_path=None, limit_to=None):
                 about_content_dict = about_object.validated_fields
                 # Add information in the dictionary where it does not
                 # present in the ABOUT file
-                about_content_dict['license_text_content'] = unicode(about_object.license_text(),
+                about_content_dict['license_text'] = unicode(about_object.license_text(),
+                                      errors='replace')
+                about_content_dict['notice_text'] = about_object.notice_text()
+
+                # FIXME: The following is a tmp code to handle multiple 
+                # 'license_text_file' in the input
+                for k in about_content_dict:
+                    if '\n' in about_content_dict[k] and k == 'license_text_file':
+                        about_content_dict['license_text'] = unicode(about_object.tmp_get_license_text(),
                                       errors='replace')
-                about_content_dict['notice_text_content'] = about_object.notice_text()
 
                 # Raise error if no license_text is found
-                if not about_content_dict['license_text_content']:
+                if not about_content_dict['license_text']:
                     msg = ('No license_text is found. '
                            'License generation is skipped.')
                     err = Error(GENATTRIB, 'name',

about_code_tool/templates/default.html

@@ -65,10 +65,10 @@ <h3 class="component-name">{{ about_object.name }}
                 {% if about_object.notice %}
                     <pre>{{ about_object.notice }}</pre>
                 {% elif about_object.notice_file %}
-                    <pre class="component-notice">{{ about_object.notice_text_content }}</pre>
+                    <pre class="component-notice">{{ about_object.notice_text }}</pre>
                 {% endif %}
-                {% if about_object.license_text_content %}
-                    <pre>{{about_object.license_text_content | e}}</pre>
+                {% if about_object.license_text %}
+                    <pre>{{about_object.license_text | e}}</pre>
                 {% endif %}
             </div>
         {% endfor %}

about_code_tool/tests/test_about.py

@@ -532,8 +532,8 @@ def test_remove_blank_lines_and_no_colon_fields(self):
             self.assertEqual(expected_warnings[i][1], w.field_value)
 
     def test_generate_attribution(self):
-        expected = u'notice_text_content:version:2.4.3about_resource:httpd-2.4.3.tar.gz'\
-                    'name:Apache HTTP Serverlicense_text_content:'
+        expected = u'notice_text:version:2.4.3about_resource:httpd-2.4.3.tar.gz'\
+                    'name:Apache HTTP Serverlicense_text:'
         about_collector = about.AboutCollector(join(TESTDATA_PATH, 'attrib/attrib.ABOUT'))
         result = about_collector.generate_attribution(join(TESTDATA_PATH, 'attrib/test.template'))
         self.assertEqual(result, expected)