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.

Comments (0)

Files changed (2)

                 # 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:

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:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.