[pypy-commit] pypy py3k: merge

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r53338:21e9237a2a45
Date: 2012-03-12 12:23 -0700
http://bitbucket.org/pypy/pypy/changeset/21e9237a2a45/

Log:	merge

diff --git a/pypy/module/_random/interp_random.py b/pypy/module/_random/interp_random.py
--- a/pypy/module/_random/interp_random.py
+++ b/pypy/module/_random/interp_random.py
@@ -73,16 +73,6 @@
         w_item = space.getitem(w_state, space.newint(rrandom.N))
         self._rnd.index = space.int_w(w_item)
 
-    def jumpahead(self, space, w_n):
-        try:
-            n = space.int_w(w_n)
-        except OperationError, e:
-            if not e.match(space, space.w_TypeError):
-                raise
-            num = space.bigint_w(w_n)
-            n = intmask(num.uintmask())
-        self._rnd.jumpahead(n)
-
     assert rbigint.SHIFT <= 32
     @unwrap_spec(k=int)
     def getrandbits(self, space, k):
@@ -107,6 +97,5 @@
     seed = interp2app(W_Random.seed),
     getstate = interp2app(W_Random.getstate),
     setstate = interp2app(W_Random.setstate),
-    jumpahead = interp2app(W_Random.jumpahead),
     getrandbits = interp2app(W_Random.getrandbits),
 )