Merge m-c to fix mach on inbound
authorMarco Bonardo <mbonardo@mozilla.com>
Tue, 23 Oct 2012 19:12:27 +0200
changeset 111299 c622871d32e419489870db2e1d04f644bb1295d2
parent 111298 5f1e6ee8b36ed31ab49a17e67b32f114f0bb4bb2 (current diff)
parent 111251 a517f7ea5befe078cd0b75ec1949c37f7f19027b (diff)
child 111300 8b9c7bf80449afe4610f1e69f92ac1b50154f6cc
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
milestone19.0a1
Merge m-c to fix mach on inbound
--- a/build/virtualenv/populate_virtualenv.py
+++ b/build/virtualenv/populate_virtualenv.py
@@ -132,17 +132,17 @@ class VirtualenvManager(object):
             directory.
 
         Note that the Python interpreter running this function should be the
         one from the virtualenv. If it is the system Python or if the
         environment is not configured properly, packages could be installed
         into the wrong place. This is how virtualenv's work.
         """
         packages = []
-        fh = open(self.manifest_path, 'rUt')
+        fh = open(self.manifest_path, 'rU')
         for line in fh:
             packages.append(line.rstrip().split(':'))
         fh.close()
 
         def handle_package(package):
             python_lib = distutils.sysconfig.get_python_lib()
             if package[0] == 'setup.py':
                 assert len(package) >= 2