[pypy-commit] pypy py3k: kill line from a mismerge

pjenvey noreply at buildbot.pypy.org
Wed Mar 14 19:46:25 CET 2012


Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r53580:e5c660f20609
Date: 2012-03-14 11:45 -0700
http://bitbucket.org/pypy/pypy/changeset/e5c660f20609/

Log:	kill line from a mismerge

diff --git a/pypy/module/math/interp_math.py b/pypy/module/math/interp_math.py
--- a/pypy/module/math/interp_math.py
+++ b/pypy/module/math/interp_math.py
@@ -381,7 +381,6 @@
 
 def log1p(space, w_x):
     """Find log(x + 1)."""
-    x = _get_double(space, w_x)
     try:
         return math1(space, rfloat.log1p, w_x)
     except OperationError as e:


More information about the pypy-commit mailing list