Commits

Georg Brandl committed a8262d1

Fixes #875 and #876: use the right file mode to successfully read config files under 2.x and 3.x.

  • Participants
  • Parent commits 66b749c
  • Branches stable

Comments (0)

Files changed (2)

File sphinx/config.py

                 # we promise to have the config dir as current dir while the
                 # config file is executed
                 os.chdir(dirname)
-                # get config source
-                f = open(config_file, 'rU')
+                # get config source -- 'b' is a no-op under 2.x, while 'U' is
+                # ignored under 3.x (but 3.x compile() accepts \r\n newlines)
+                f = open(config_file, 'rbU')
                 try:
                     source = f.read()
                 finally:

File tests/test_quickstart.py

     conffile = tempdir / 'conf.py'
     assert conffile.isfile()
     ns = {}
-    f = open(conffile, 'U')
+    f = open(conffile, 'rbU')
     try:
         code = compile(f.read(), conffile, 'exec')
     finally:
     conffile = tempdir / 'source' / 'conf.py'
     assert conffile.isfile()
     ns = {}
-    f = open(conffile, 'U')
+    f = open(conffile, 'rbU')
     try:
         code = compile(f.read(), conffile, 'exec')
     finally: