Minor code changes and comments

Author: chinyeungli

about_code_tool/about.py

@@ -1224,13 +1224,12 @@ def write_to_csv(self, output_path):
                 row_data = about_object.get_row_data(relative_path, custom_keys)
                 csv_writer.writerow(row_data)
 
-    def generate_attribution(self, template_path, limit_to=None):
+    def generate_attribution(self, template_path=None, limit_to=None):
         """
         Generate an attribution file from the current list of ABOUT objects.
         The optional `limit_to` parameter allows to restrict the generated
         attribution to a specific list of component names.
         """
-
         try:
             import jinja2 as j2
         except ImportError:
@@ -1239,6 +1238,11 @@ def generate_attribution(self, template_path, limit_to=None):
                   '"configure"')
             return
 
+        # For some reasons, if I set the template_path = "templates/default.html"
+        # in the parameter, the tempalte_path will become 'None' and cause error
+        if not template_path:
+            template_path = "templates/default.html"
+
         # FIXME: the template dir should be outside the code tree
         template_dir = os.path.dirname(template_path)
         template_file_name = os.path.basename(template_path)
@@ -1249,7 +1253,6 @@ def generate_attribution(self, template_path, limit_to=None):
             template = jinja_env.get_template(template_file_name)
         except j2.TemplateNotFound:
             return
-
         limit_to = limit_to or []
         limit_to = set(limit_to)
 

about_code_tool/genattrib.py

@@ -133,8 +133,7 @@ def main(parser, options, args):
     overwrite = options.overwrite
     verbosity = options.verbosity
     mapping_config = options.mapping
-    template_location = options.template_location \
-        if options.template_location else "templates/default.html"
+    template_location = options.template_location
 
     if options.version:
         print('ABOUT tool {0}\n{1}'.format(__version__, __copyright__))

about_code_tool/tests/test_about.py

@@ -605,7 +605,7 @@ def test_remove_blank_lines_and_no_colon_fields(self):
             self.assertEqual(expected_warnings[i][0], w.code)
             self.assertEqual(expected_warnings[i][1], w.field_value)
 
-    def test_generate_attribution(self):
+    def test_generate_attribution_with_custom_template(self):
         expected = (u'notice_text:'
                     'version:2.4.3'
                     'about_resource:httpd-2.4.3.tar.gz'