[pypy-svn] r71803 - pypy/release/1.2.x/pypy/translator/platform
arigo at codespeak.net
arigo at codespeak.net
Fri Mar 5 15:29:53 CET 2010
Author: arigo
Date: Fri Mar 5 15:29:52 2010
New Revision: 71803
Modified:
pypy/release/1.2.x/pypy/translator/platform/__init__.py
Log:
svn merge svn+ssh://codespeak.net/svn/pypy/trunk -r71801:71802
Modified: pypy/release/1.2.x/pypy/translator/platform/__init__.py
==============================================================================
--- pypy/release/1.2.x/pypy/translator/platform/__init__.py (original)
+++ pypy/release/1.2.x/pypy/translator/platform/__init__.py Fri Mar 5 15:29:52 2010
@@ -181,13 +181,11 @@
elif sys.platform == 'darwin':
from pypy.translator.platform.darwin import Darwin_i386, Darwin_x86_64
import platform
- if platform.machine() == 'i386':
- if sys.maxint <= 2147483647:
- host_factory = Darwin_i386
- else:
- host_factory = Darwin_x86_64
+ assert platform.machine() in ('i386', 'x86_64')
+ if sys.maxint <= 2147483647:
+ host_factory = Darwin_i386
else:
- host_factory = Darwin
+ host_factory = Darwin_x86_64
elif sys.platform == 'freebsd7':
from pypy.translator.platform.freebsd7 import Freebsd7, Freebsd7_64
import platform
More information about the Pypy-commit
mailing list