diff options
| author |   Armin Rigo <arigo@tunes.org> | 2015-01-16 10:58:21 +0100 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2015-01-16 10:58:21 +0100 |
| commit | 55e0d3589b002fe0b8e6e508b2b4f40b699fe830 (patch) | |
| tree | 37ad3b0aa6bd36ce2bbb877dfd88c5b903adae5f /lib-python | |
| parent | fix (diff) | |
| parent | Expand trace_slow_path to speed up tracing of dictionaries (with commonly (diff) | |
| download | pypy-55e0d3589b002fe0b8e6e508b2b4f40b699fe830.tar.gz pypy-55e0d3589b002fe0b8e6e508b2b4f40b699fe830.tar.bz2 pypy-55e0d3589b002fe0b8e6e508b2b4f40b699fe830.zip | |
hg merge default
Diffstat (limited to 'lib-python')
| -rw-r--r-- | lib-python/2.7/distutils/unixccompiler.py | 2 | ||||
| -rw-r--r-- | lib-python/2.7/subprocess.py | 2 | ||||
| -rw-r--r-- | lib-python/2.7/test/test_xml_etree.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib-python/2.7/distutils/unixccompiler.py b/lib-python/2.7/distutils/unixccompiler.py index b55bfd7679..e7fcda9d5a 100644 --- a/lib-python/2.7/distutils/unixccompiler.py +++ b/lib-python/2.7/distutils/unixccompiler.py @@ -58,7 +58,7 @@ class UnixCCompiler(CCompiler): executables = {'preprocessor' : None, 'compiler' : ["cc"], 'compiler_so' : ["cc"], - 'compiler_cxx' : ["cc"], + 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus 'linker_so' : ["cc", "-shared"], 'linker_exe' : ["cc"], 'archiver' : ["ar", "-cr"], diff --git a/lib-python/2.7/subprocess.py b/lib-python/2.7/subprocess.py index b14068a374..e6ab29c3d6 100644 --- a/lib-python/2.7/subprocess.py +++ b/lib-python/2.7/subprocess.py @@ -1589,7 +1589,7 @@ def _pypy_install_libs_after_virtualenv(target_executable): 'copyfile' in caller.f_globals): dest_dir = sys.pypy_resolvedirof(target_executable) src_dir = sys.pypy_resolvedirof(sys.executable) - for libname in ['libpypy-c.so']: + for libname in ['libpypy-c.so', 'libpypy-c.dylib']: dest_library = os.path.join(dest_dir, libname) src_library = os.path.join(src_dir, libname) if os.path.exists(src_library): diff --git a/lib-python/2.7/test/test_xml_etree.py b/lib-python/2.7/test/test_xml_etree.py index bb57468e11..8ba0e2c600 100644 --- a/lib-python/2.7/test/test_xml_etree.py +++ b/lib-python/2.7/test/test_xml_etree.py @@ -225,9 +225,9 @@ def simpleops(): >>> element.remove(subelement) >>> serialize(element) # 5 '<tag key="value" />' - >>> element.remove(subelement) + >>> element.remove(subelement) # doctest: +ELLIPSIS Traceback (most recent call last): - ValueError: list.remove(x): x not in list + ValueError: list.remove(... >>> serialize(element) # 6 '<tag key="value" />' >>> element[0:0] = [subelement, subelement, subelement] |