[pypy-svn] pypy default: add support for the PYTHONNOUSERSITE env variable

antocuni commits-noreply at bitbucket.org
Mon Feb 14 18:28:58 CET 2011


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r41912:b07350bf637b
Date: 2011-02-14 17:21 +0100
http://bitbucket.org/pypy/pypy/changeset/b07350bf637b/

Log:	add support for the PYTHONNOUSERSITE env variable

diff --git a/pypy/translator/goal/app_main.py b/pypy/translator/goal/app_main.py
--- a/pypy/translator/goal/app_main.py
+++ b/pypy/translator/goal/app_main.py
@@ -404,6 +404,9 @@
     # (relevant in case of "reload(sys)")
     sys.argv[:] = argv
 
+    if (PYTHON26 and not options["ignore_environment"] and os.getenv('PYTHONNOUSERSITE')):
+        options["no_user_site"] = True
+
     if (options["interactive"] or
         (not options["ignore_environment"] and os.getenv('PYTHONINSPECT'))):
         options["inspect"] = True

diff --git a/pypy/translator/goal/test2/test_app_main.py b/pypy/translator/goal/test2/test_app_main.py
--- a/pypy/translator/goal/test2/test_app_main.py
+++ b/pypy/translator/goal/test2/test_app_main.py
@@ -181,6 +181,11 @@
             self.check([opt, '-c', 'pass'], sys_argv=['-c'],
                        run_command='pass', **expected)
 
+    def test_sysflags_envvar(self, monkeypatch):
+        monkeypatch.setenv('PYTHONNOUSERSITE', '1')
+        expected = {"no_user_site": True}
+        self.check(['-c', 'pass'], sys_argv=['-c'], run_command='pass', **expected)
+        
 
 class TestInteraction:
     """


More information about the Pypy-commit mailing list