Delete more code used for supporting Python 2 (#1989)

* Delete more python2 stuff

* Use context manager for file handles

Author: ni-jfitzger

build/generate_template.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 
-import codecs
 import logging
 from mako.exceptions import RichTraceback
 from mako.lookup import TemplateLookup
@@ -47,14 +46,8 @@ def generate_template(template_name, template_params, dest_file, in_zip_file=Fal
         sys.exit(1)
 
     logging.debug(rendered_template)
-    if sys.version_info.major < 3:
-        file_handle_public = codecs.open(dest_file, mode="w", encoding='utf-8')
-        file_handle_public.write(rendered_template)
-        file_handle_public.close()
-    else:
-        file_handle_public = open(dest_file, 'wb')
+    with open(dest_file, 'wb') as file_handle_public:
         file_handle_public.write(bytes(rendered_template, "UTF-8"))
-        file_handle_public.close()
 
 
 

build/helper/documentation_helper.py

@@ -11,24 +11,11 @@
 
 import pprint
 import re
-import string
 import sys
 
 pp = pprint.PrettyPrinter(indent=4, width=80)
 
 
-# Python 2/3 compatibility
-def _normalize_string_type(d):
-    '''Normalize string type between python2 & python3'''
-    if sys.version_info.major < 3:
-        if type(d) is dict:
-            for k in d:
-                d[k] = _normalize_string_type(d[k])
-        elif type(d) is str:
-            d = d.decode('utf-8')
-    return d
-
-
 def get_indented_docstring_snippet(d, indent=4):
     '''Returns a docstring with the correct amount of indentation.
 
@@ -52,7 +39,7 @@ def get_indented_docstring_snippet(d, indent=4):
             ret_val += '\n'
             if len(line.rstrip()) > 0:
                 ret_val += (' ' * indent)
-        ret_val += _normalize_string_type(line.rstrip())
+        ret_val += line.rstrip()
     return ret_val
 
 
@@ -637,17 +624,13 @@ def as_rest_table(data, header=True):
     template = '{0}{1}{2}'.format(start_of_line, meta_template.format(*sizes), end_of_line)
     # determine top/bottom borders
     to_separator = {ord('|'): '+', ord(' '): '-'}
-    if sys.version_info.major < 3:
-        to_separator = string.maketrans('| ', '+-')
 
     start_of_line = start_of_line.translate(to_separator)
     vertical_separator = vertical_separator.translate(to_separator)
     end_of_line = end_of_line.translate(to_separator)
     separator = '{0}{1}{2}'.format(start_of_line, vertical_separator.join([x * line_marker for x in sizes]), end_of_line)
     # determine header separator
     th_separator_tr = {ord('-'): '='}
-    if sys.version_info.major < 3:
-        th_separator_tr = string.maketrans('-', '=')
     start_of_line = start_of_line.translate(th_separator_tr)
     line_marker = line_marker.translate(th_separator_tr)
     vertical_separator = vertical_separator.translate(th_separator_tr)

tools/simple_mako.py

@@ -1,7 +1,6 @@
 # !python
 
 import argparse
-import codecs
 from configure_logging import configure_logging
 import logging
 from mako.exceptions import RichTraceback
@@ -49,14 +48,8 @@ def generate_template(template_name, template_params, dest_file):
         sys.exit(1)
 
     logging.debug(rendered_template)
-    if sys.version_info.major < 3:
-        file_handle_public = codecs.open(dest_file, mode="w", encoding='utf-8')
-        file_handle_public.write(rendered_template)
-        file_handle_public.close()
-    else:
-        file_handle_public = open(dest_file, 'wb')
+    with open(dest_file, 'wb') as file_handle_public:
         file_handle_public.write(bytes(rendered_template, "UTF-8"))
-        file_handle_public.close()
 
 
 def main():