the unified_dict_list is not working. restore the code base.

Author: chinyeungli

about_code_tool/genabout.py

@@ -13,7 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 # ============================================================================
-
 """
 This is a tool to generate ABOUT files based on the input file.
 The input file should be a csv format which contains information about the
@@ -22,25 +21,25 @@
 
 from __future__ import print_function
 
+from collections import namedtuple
 import copy
 import csv
 import errno
 import json
 import logging
 import optparse
+from os import makedirs
 import os
+from os.path import exists, dirname, join, abspath, isdir, normpath, basename, expanduser
 import shutil
 import sys
 import urllib
 import urllib2
-
-from collections import namedtuple
 from urlparse import urljoin, urlparse
-from os import makedirs
-from os.path import exists, dirname, join, abspath, isdir, normpath, basename, expanduser
 
 import about
 
+
 __version__ = '2.0.2'
 
 __copyright__ = """
@@ -597,22 +596,19 @@ def format_output(input_list):
         """
         components_list = []
         for about_file_location, about_dict_list in input_list:
-            unified_dict_list = {}
-            for key in about_dict_list:
-                unified_dict_list[key] = u''.join(about_dict_list[key])
             component = []
-            component_name = unified_dict_list.get('name', '')
-            component_version = unified_dict_list.get('version', '')
+            component_name = about_dict_list.get('name', '')
+            component_version = about_dict_list.get('version', '')
             context = 'about_resource: %s\nname: %s\nversion: %s\n\n' % (
-                unified_dict_list['about_resource'], component_name, component_version)
+                about_dict_list['about_resource'], component_name, component_version)
 
-            for item in sorted(unified_dict_list.iterkeys()):
+            for item in sorted(about_dict_list.iterkeys()):
                 if item == 'about_file':
                     continue
                 if not item in about.MANDATORY_FIELDS:
                     # The purpose of the replace('\n', '\n ') is used to
                     # format the continuation strings
-                    value = unified_dict_list[item].replace('\n', '\n ')
+                    value = about_dict_list[item].replace('\n', '\n ')
                     if (value or item in about.MANDATORY_FIELDS) and not item\
                         in about.ERROR_WARN_FIELDS and not item == 'about_resource':
                         context += item + ': ' + value + '\n'