Index: Objects/listsort.txt =================================================================== --- Objects/listsort.txt (revision 74612) +++ Objects/listsort.txt (working copy) @@ -606,7 +606,7 @@ def fill(n): from random import random - return [random() for i in xrange(n)] + return [random() for i in range(n)] def mycmp(x, y): global ncmp Index: Objects/rangeobject.c =================================================================== --- Objects/rangeobject.c (revision 74612) +++ Objects/rangeobject.c (working copy) @@ -431,7 +431,7 @@ rangeiter_new, /* tp_new */ }; -/* Return number of items in range/xrange (lo, hi, step). step > 0 +/* Return number of items in range (lo, hi, step). step > 0 * required. Return a value < 0 if & only if the true value is too * large to fit in a signed long. */ Index: Tools/pybench/README =================================================================== --- Tools/pybench/README (revision 74612) +++ Tools/pybench/README (working copy) @@ -260,10 +260,7 @@ # Run test rounds # - # NOTE: Use xrange() for all test loops unless you want to face - # a 20MB process ! - # - for i in xrange(self.rounds): + for i in range(self.rounds): # Repeat the operations per round to raise the run-time # per operation significantly above the noise level of the @@ -305,7 +302,7 @@ a = 1 # Run test rounds (without actually doing any operation) - for i in xrange(self.rounds): + for i in range(self.rounds): # Skip the actual execution of the operations, since we # only want to measure the test's administration overhead. Index: Doc/library/os.rst =================================================================== --- Doc/library/os.rst (revision 74612) +++ Doc/library/os.rst (working copy) @@ -396,7 +396,7 @@ Close all file descriptors from *fd_low* (inclusive) to *fd_high* (exclusive), ignoring errors. Availability: Unix, Windows. Equivalent to:: - for fd in xrange(fd_low, fd_high): + for fd in range(fd_low, fd_high): try: os.close(fd) except OSError: Index: Doc/includes/mp_pool.py =================================================================== --- Doc/includes/mp_pool.py (revision 74612) +++ Doc/includes/mp_pool.py (working copy) @@ -98,17 +98,17 @@ t = time.time() A = list(map(pow3, range(N))) - print('\tmap(pow3, xrange(%d)):\n\t\t%s seconds' % \ + print('\tmap(pow3, range(%d)):\n\t\t%s seconds' % \ (N, time.time() - t)) t = time.time() B = pool.map(pow3, range(N)) - print('\tpool.map(pow3, xrange(%d)):\n\t\t%s seconds' % \ + print('\tpool.map(pow3, range(%d)):\n\t\t%s seconds' % \ (N, time.time() - t)) t = time.time() C = list(pool.imap(pow3, range(N), chunksize=N//8)) - print('\tlist(pool.imap(pow3, xrange(%d), chunksize=%d)):\n\t\t%s' \ + print('\tlist(pool.imap(pow3, range(%d), chunksize=%d)):\n\t\t%s' \ ' seconds' % (N, N//8, time.time() - t)) assert A == B == C, (len(A), len(B), len(C))