ada: do not use binary mode in conf.py

Message ID b1dc433b-bdf9-f91b-e78d-7dc191cdc938@suse.cz
State New
Headers show
Series
  • ada: do not use binary mode in conf.py
Related show

Commit Message

Martin Liška May 11, 2021, 5:32 p.m.
It's about more porting to Python3.

Ready for master?
Thanks,
Martin

gcc/ada/ChangeLog:

	* doc/share/conf.py: Do not use binary mode.
	Do not use u' literals as Python3 uses unicode by default.
---
  gcc/ada/doc/share/conf.py | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)

-- 
2.31.1

Comments

Arnaud Charlet May 12, 2021, 8:30 a.m. | #1
> It's about more porting to Python3.

> 

> Ready for master?


OK, thanks.

> gcc/ada/ChangeLog:

> 

> 	* doc/share/conf.py: Do not use binary mode.

> 	Do not use u' literals as Python3 uses unicode by default.

Patch

diff --git a/gcc/ada/doc/share/conf.py b/gcc/ada/doc/share/conf.py
index debd71688b8..705a6787056 100644
--- a/gcc/ada/doc/share/conf.py
+++ b/gcc/ada/doc/share/conf.py
@@ -18,9 +18,9 @@  import latex_elements
  
  DOCS = {
      'gnat_rm': {
-        'title': u'GNAT Reference Manual'},
+        'title': 'GNAT Reference Manual'},
      'gnat_ugn': {
-        'title': u'GNAT User\'s Guide for Native Platforms'}}
+        'title': 'GNAT User\'s Guide for Native Platforms'}}
  
  # Then retrieve the source directory
  root_source_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -28,17 +28,17 @@  gnatvsn_spec = os.path.join(root_source_dir, '..', 'gnatvsn.ads')
  basever = os.path.join(root_source_dir, '..', '..', 'BASE-VER')
  texi_fsf = True  # Set to False when FSF doc is switched to sphinx by default
  
-with open(gnatvsn_spec, 'rb') as fd:
+with open(gnatvsn_spec, 'r') as fd:
      gnatvsn_content = fd.read()
  
  
  def get_copyright():
-    return u'2008-%s, Free Software Foundation' % time.strftime('%Y')
+    return '2008-%s, Free Software Foundation' % time.strftime('%Y')
  
  
  def get_gnat_version():
-    m = re.search(br'Gnat_Static_Version_String : ' +
-                  br'constant String := "([^\(\)]+)\(.*\)?";',
+    m = re.search(r'Gnat_Static_Version_String : ' +
+                  r'constant String := "([^\(\)]+)\(.*\)?";',
                    gnatvsn_content)
      if m:
          return m.group(1).strip().decode()
@@ -57,12 +57,12 @@  def get_gnat_version():
  
  
  def get_gnat_build_type():
-    m = re.search(br'Build_Type : constant Gnat_Build_Type := (.+);',
+    m = re.search(r'Build_Type : constant Gnat_Build_Type := (.+);',
                    gnatvsn_content)
      if m:
-        return {b'Gnatpro': 'PRO',
-                b'FSF': 'FSF',
-                b'GPL': 'GPL'}[m.group(1).strip()]
+        return {'Gnatpro': 'PRO',
+                'FSF': 'FSF',
+                'GPL': 'GPL'}[m.group(1).strip()]
      else:
          print('cannot compute GNAT build type')
          sys.exit(1)
@@ -119,8 +119,8 @@  copyright_macros = {
      'date': time.strftime("%b %d, %Y"),
      'edition': 'GNAT %s Edition' % 'Pro' if get_gnat_build_type() == 'PRO'
                 else 'GPL',
-    'name': u'GNU Ada',
-    'tool': u'GNAT',
+    'name': 'GNU Ada',
+    'tool': 'GNAT',
      'version': version}
  
  latex_elements = {
@@ -134,11 +134,11 @@  latex_elements = {
      'tableofcontents': latex_elements.TOC % copyright_macros}
  
  latex_documents = [
-    (master_doc, '%s.tex' % doc_name, project, u'AdaCore', 'manual')]
+    (master_doc, '%s.tex' % doc_name, project, 'AdaCore', 'manual')]
  
  texinfo_documents = [
      (master_doc, doc_name, project,
-     u'AdaCore', doc_name, doc_name, '')]
+     'AdaCore', doc_name, doc_name, '')]
  
  
  def setup(app):