[rtems-docs commit] waf: Fix python3 issues.

Chris Johns chrisj at rtems.org
Wed Feb 27 22:17:39 UTC 2019


Module:    rtems-docs
Branch:    master
Commit:    1599d9937a416e2f48e2d3dc84ecec266fbbfa98
Changeset: http://git.rtems.org/rtems-docs/commit/?id=1599d9937a416e2f48e2d3dc84ecec266fbbfa98

Author:    Chris Johns <chrisj at rtems.org>
Date:      Thu Feb 28 09:16:57 2019 +1100

waf: Fix python3 issues.

- Found after updating to FreeBSD-12.0 which defaults to Python3.

---

 posix-compliance/posix_rst.py |  2 +-
 wscript                       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/posix-compliance/posix_rst.py b/posix-compliance/posix_rst.py
index c053efa..1dd85fb 100755
--- a/posix-compliance/posix_rst.py
+++ b/posix-compliance/posix_rst.py
@@ -142,7 +142,7 @@ class compliance:
         self.data = None
 
     def load(self, name):
-        with open(name, 'rb') as f:
+        with open(name, 'r') as f:
             data = csv.reader(f, delimiter = ',', quotechar = '"')
             hdr = None
             rows = []
diff --git a/wscript b/wscript
index 5244417..5f8464d 100644
--- a/wscript
+++ b/wscript
@@ -7,6 +7,13 @@ import os.path
 
 import waflib
 
+#
+# Set Python's system path to `common` from the top level so the
+# conf.py modules in subdirectories can be found. See xml_catalogue in
+# common/waf.py.
+#
+sys.path.append(os.path.abspath('common'))
+
 from common import waf as docs_waf
 from common import version
 
@@ -16,13 +23,6 @@ from common import version
 rtems_major_version = '5'
 
 #
-# Set Python's system path to `common` from the top level so the
-# conf.py modules in subdirectories can be found. See xml_catalogue in
-# common/waf.py.
-#
-sys.path.append(os.path.abspath('common'))
-
-#
 # The documents to build.
 #
 build_all = ['user',



More information about the vc mailing list