[pypy-svn] r36326 - pypy/dist/lib-python

ac at codespeak.net ac at codespeak.net
Tue Jan 9 11:33:50 CET 2007


Author: ac
Date: Tue Jan  9 11:33:49 2007
New Revision: 36326

Modified:
   pypy/dist/lib-python/conftest.py
Log:
Workaround options problem.

Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Tue Jan  9 11:33:49 2007
@@ -301,15 +301,15 @@
         self.core = core
 
     def oldstyle(self): 
-        return self._oldstyle or pypy_option.oldstyle 
+        return self._oldstyle #or pypy_option.oldstyle 
     oldstyle = property(oldstyle)
 
     def usemodules(self):
-        return self._usemodules + pypy_option.usemodules
+        return self._usemodules #+ pypy_option.usemodules
     usemodules = property(usemodules)
 
     def compiler(self): 
-        return self._compiler or pypy_option.compiler 
+        return self._compiler #or pypy_option.compiler 
     compiler = property(compiler)
 
     def getoptions(self): 



More information about the Pypy-commit mailing list