Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r55211:a4b123ac5ec1
Date: 2012-05-30 22:33 +0200
http://bitbucket.org/pypy/pypy/changeset/a4b123ac5ec1/
Log: Merge glitch
diff --git a/pypy/rlib/rposix.py b/pypy/rlib/rposix.py
--- a/pypy/rlib/rposix.py
+++ b/pypy/rlib/rposix.py
@@ -247,7 +247,6 @@
else:
return nt._getfullpathname(path.as_bytes())
-<<<<<<< local
@specialize.argtype(0, 1)
def putenv(name, value):
if isinstance(name, str):
@@ -262,11 +261,9 @@
else:
del os.environ[name.as_bytes()]
-=======
if os.name == 'nt':
from pypy.rlib import rwin32
os_kill = rwin32.os_kill
else:
os_kill = os.kill
->>>>>>> other
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
