Fixed #501 consistant code for opening file

 * instead of using codes.open, the code now use the default open() function

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/attrib.py

@@ -229,7 +229,7 @@ def generate_from_file(abouts, is_about_input, license_dict, scancode, min_licen
             template_loc = add_unc(DEFAULT_TEMPLATE_FILE)
     else:
         template_loc = add_unc(template_loc)
-    with io.open(template_loc, encoding='utf-8', errors='replace') as tplf:
+    with open(template_loc, encoding='utf-8', errors='replace') as tplf:
         tpls = tplf.read()
     return generate(abouts, is_about_input, license_dict, scancode, min_license_score, template=tpls, vartext=vartext)
 
@@ -267,7 +267,7 @@ def generate_and_save(abouts, is_about_input, license_dict, output_location, sca
 
     if rendered:
         output_location = add_unc(output_location)
-        with io.open(output_location, 'w', encoding='utf-8', errors='replace') as of:
+        with open(output_location, 'w', encoding='utf-8', errors='replace') as of:
             of.write(rendered)
 
     return errors, rendered

src/attributecode/cmd.py

@@ -340,7 +340,8 @@ def gen_license(location, output, djc, scancode, verbose):
         api_key = djc[1].strip("'").strip('"')
 
     click.echo('Fetching licenses...')
-    license_dict, lic_errors = pre_process_and_fetch_license_dict(abouts, api_url, api_key, scancode)
+    from_check = False
+    license_dict, lic_errors = pre_process_and_fetch_license_dict(abouts, from_check, api_url, api_key, scancode)
 
     if lic_errors:
         errors.extend(lic_errors)
@@ -370,7 +371,7 @@ def validate_template(ctx, param, value):
     if not value:
         return None
 
-    with io.open(value, encoding='utf-8', errors='replace') as templatef:
+    with open(value, encoding='utf-8', errors='replace') as templatef:
         template_error = check_template(templatef.read())
 
     if template_error:
@@ -523,7 +524,8 @@ def attrib(input, output, api_url, api_key, scancode, min_license_score, referen
             api_key = ''
         api_url = api_url.strip("'").strip('"')
         api_key = api_key.strip("'").strip('"')
-        license_dict, lic_errors = pre_process_and_fetch_license_dict(abouts, api_url, api_key, scancode, reference)
+        from_check = False
+        license_dict, lic_errors = pre_process_and_fetch_license_dict(abouts, from_check, api_url, api_key, scancode, reference)
         errors.extend(lic_errors)
         sorted_license_dict = sorted(license_dict)
 
@@ -823,7 +825,7 @@ def report_errors(errors, quiet, verbose, log_file_loc=None):
             for msg in log_msgs:
                 click.echo(msg)
         if log_msgs and log_file_loc:
-            with io.open(log_file_loc, 'w', encoding='utf-8', errors='replace') as lf:
+            with open(log_file_loc, 'w', encoding='utf-8', errors='replace') as lf:
                 lf.write('\n'.join(log_msgs))
             click.echo("Error log: " + log_file_loc)
     return severe_errors_count

src/attributecode/gen.py

@@ -44,7 +44,7 @@ def check_duplicated_columns(location):
     at location.
     """
     location = add_unc(location)
-    with codecs.open(location, 'rb', encoding='utf-8-sig', errors='replace') as csvfile:
+    with open(location, mode='r', encoding='utf-8-sig', errors='replace') as csvfile:
         reader = csv.reader(csvfile)
         columns = next(reader)
         columns = [col for col in columns]

src/attributecode/model.py

@@ -585,7 +585,7 @@ def _validate(self, *args, **kwargs):
             try:
                 # TODO: we have lots the location by replacing it with a text
                 location = add_unc(location)
-                with io.open(location, encoding='utf-8', errors='replace') as txt:
+                with open(location, encoding='utf-8', errors='replace') as txt:
                     text = txt.read()
                 self.value[path] = text
             except Exception as e:
@@ -995,7 +995,7 @@ def load(self, location):
         errors = []
         try:
             loc = add_unc(loc)
-            with io.open(loc, encoding='utf-8', errors='replace') as txt:
+            with open(loc, encoding='utf-8', errors='replace') as txt:
                 input_text = txt.read()
             if not input_text:
                 msg = 'ABOUT file is empty: %(location)r'
@@ -1235,7 +1235,7 @@ def dump(self, location, lic_dict=None):
         if on_windows:
             about_file_path = add_unc(about_file_path)
 
-        with io.open(about_file_path, mode='w', encoding='utf-8', errors='replace') as dumped:
+        with open(about_file_path, mode='w', encoding='utf-8', errors='replace') as dumped:
             dumped.write(genereated_tk_version)
             dumped.write(self.dumps(lic_dict))
 
@@ -1246,7 +1246,7 @@ def dump_android_notice(self, path, context):
         if on_windows:
             path = add_unc(path)
 
-        with io.open(path, mode='w', encoding='utf-8', errors='replace') as dumped:
+        with open(path, mode='w', encoding='utf-8', errors='replace') as dumped:
             dumped.write(context)
 
     def android_module_license(self, about_parent_path):
@@ -1317,7 +1317,7 @@ def dump_lic(self, location, license_dict):
                         license_name, license_filename, license_context, license_url, spdx_license_key = license_dict[lic_key]
                         license_info = (lic_key, license_name, license_filename, license_context, license_url, spdx_license_key)
                         license_key_name_context_url.append(license_info)
-                        with io.open(license_path, mode='w', encoding='utf-8', newline='\n', errors='replace') as lic:
+                        with open(license_path, mode='w', encoding='utf-8', newline='\n', errors='replace') as lic:
                             lic.write(license_context)
                     else:
                         # Invalid license issue is already handled
@@ -1372,7 +1372,7 @@ def collect_abouts_license_expression(location):
     for loc in about_locations:
         try:
             loc = add_unc(loc)
-            with io.open(loc, encoding='utf-8', errors='replace') as txt:
+            with open(loc, encoding='utf-8', errors='replace') as txt:
                 input_text = txt.read()
             # saneyaml.load() will have parsing error if the input has
             # tab value. Therefore, we should check if the input contains
@@ -1627,12 +1627,12 @@ def write_output(abouts, location, format):  # NOQA
         save_as_excel(location, about_dicts)
 
 def save_as_json(location, about_dicts):
-    with io.open(location, mode='w') as output_file:
+    with open(location, mode='w') as output_file:
         data = util.format_about_dict_for_json_output(about_dicts)
         output_file.write(json.dumps(data, indent=2))
 
 def save_as_csv(location, about_dicts, field_names):
-    with io.open(location, mode='w', encoding='utf-8', newline='', errors='replace') as output_file:
+    with open(location, mode='w', encoding='utf-8', newline='', errors='replace') as output_file:
         writer = csv.DictWriter(output_file, field_names)
         writer.writeheader()
         csv_formatted_list = util.format_about_dict_output(about_dicts)

src/attributecode/transform.py

@@ -282,7 +282,7 @@ def from_file(cls, location):
         Load and return a Transformer instance from a YAML configuration file at
         `location`.
         """
-        with io.open(location, encoding='utf-8', errors='replace') as conf:
+        with open(location, encoding='utf-8', errors='replace') as conf:
             data = saneyaml.load(replace_tab_with_spaces(conf.read()))
         return cls(
             field_renamings=data.get('field_renamings', {}),
@@ -381,7 +381,7 @@ def read_csv_rows(location):
     """
     Yield rows (as a list of values) from a CSV file at `location`.
     """
-    with io.open(location, encoding='utf-8', errors='replace') as csvfile:
+    with open(location, encoding='utf-8', errors='replace') as csvfile:
         reader = csv.reader(csvfile)
         for row in reader:
             yield row
@@ -391,7 +391,7 @@ def read_json(location):
     """
     Yield rows (as a list of values) from a CSV file at `location`.
     """
-    with io.open(location, encoding='utf-8', errors='replace') as jsonfile:
+    with open(location, encoding='utf-8', errors='replace') as jsonfile:
         return json.load(jsonfile)
 
 
@@ -400,7 +400,7 @@ def write_csv(location, data, field_names):  # NOQA
     Write a CSV file at `location` the `data` list of ordered dicts using the
     `field_names`.
     """
-    with io.open(location, 'w', encoding='utf-8', newline='\n', errors='replace') as csvfile:
+    with open(location, 'w', encoding='utf-8', newline='\n', errors='replace') as csvfile:
         writer = csv.DictWriter(csvfile, fieldnames=field_names)
         writer.writeheader()
         writer.writerows(data)
@@ -429,7 +429,7 @@ def read_excel(location):
     while index <= max_col:
         value = sheet_obj.cell(row=1, column=index).value
         if value in col_keys:
-            msg = 'Duplicated column name, ' + str(value) + ', detected.' 
+            msg = 'Duplicated column name, ' + str(value) + ', detected.'
             errors.append(Error(CRITICAL, msg))
             return errors, results
         if value in mapping_dict:

src/attributecode/util.py

@@ -262,7 +262,7 @@ def load_csv(location):
     for each row.
     """
     results = []
-    with codecs.open(location, mode='rb', encoding='utf-8-sig',
+    with open(location, mode='r', encoding='utf-8-sig',
                      errors='replace') as csvfile:
         for row in csv.DictReader(csvfile):
             # convert all the column keys to lower case
@@ -689,7 +689,7 @@ def load_excel(location):
     while index <= max_col:
         value = sheet_obj.cell(row=1, column=index).value
         if value in col_keys:
-            msg = 'Duplicated column name, ' + str(value) + ', detected.' 
+            msg = 'Duplicated column name, ' + str(value) + ', detected.'
             errors.append(Error(CRITICAL, msg))
             return errors, results
         if value in mapping_dict:
@@ -721,7 +721,7 @@ def write_licenses(lic_dict, location):
     try:
         for lic in lic_dict:
             output_location = posixpath.join(loc, lic)
-            with io.open(output_location, 'w', encoding='utf-8', errors='replace') as out:
+            with open(output_location, 'w', encoding='utf-8', errors='replace') as out:
                 out.write(lic_dict[lic])
     except Exception as e:
         msg = str(e)

tests/test_attrib.py

@@ -63,7 +63,7 @@ def test_check_template_all_builtin_templates_are_valid(self):
         builtin_templates_dir = os.path.dirname(attrib.DEFAULT_TEMPLATE_FILE)
         for template in os.listdir(builtin_templates_dir):
             template_loc = os.path.join(builtin_templates_dir, template)
-            with io.open(template_loc, 'r', encoding='utf-8', errors='replace') as tmpl:
+            with open(template_loc, 'r', encoding='utf-8', errors='replace') as tmpl:
                 template = tmpl.read()
             try:
                 assert None == attrib.check_template(template)

tests/test_cmd.py

@@ -156,7 +156,7 @@ def test_report_errors_can_write_to_logfile():
     result_file = get_temp_file()
     _ec = cmd.report_errors(errors, quiet=False, verbose=True,
                            log_file_loc=result_file)
-    with io.open(result_file, 'r', encoding='utf-8', errors='replace') as rf:
+    with open(result_file, 'r', encoding='utf-8', errors='replace') as rf:
         result = rf.read()
     expected = [
         'Command completed with 6 errors or warnings.',

tests/test_model.py

@@ -93,7 +93,7 @@ def get_unicode_content(location):
     """
     Read file at location and return a unicode string.
     """
-    with io.open(location, encoding='utf-8', errors='replace') as doc:
+    with open(location, encoding='utf-8', errors='replace') as doc:
         return doc.read()