X Tutup
Skip to content

Commit fe126e3

Browse files
author
andrew.kuchling
committed
#687648 from Robert Schuppenies: use classic division.
git-svn-id: http://svn.python.org/projects/python/trunk@66428 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent b877c4c commit fe126e3

File tree

12 files changed

+33
-33
lines changed

12 files changed

+33
-33
lines changed

‎Demo/pdist/cmptree.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def recvfile_real(local, remote, name):
197197
dt = t2-t1
198198
print size, "bytes in", round(dt), "seconds",
199199
if dt:
200-
print "i.e.", int(size/dt), "bytes/sec",
200+
print "i.e.", size//dt, "bytes/sec",
201201
print
202202
remote._recv(id) # ignored
203203

‎Demo/rpc/xdr.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def pack_double(self, x):
5757
def pack_fstring(self, n, s):
5858
if n < 0:
5959
raise ValueError, 'fstring size must be nonnegative'
60-
n = ((n+3)/4)*4
60+
n = ((n + 3)//4)*4
6161
data = s[:n]
6262
data = data + (n - len(data)) * '\0'
6363
self.buf = self.buf + data
@@ -164,7 +164,7 @@ def unpack_fstring(self, n):
164164
if n < 0:
165165
raise ValueError, 'fstring size must be nonnegative'
166166
i = self.pos
167-
j = i + (n+3)/4*4
167+
j = i + (n+3)//4*4
168168
if j > len(self.buf):
169169
raise EOFError
170170
self.pos = j

‎Demo/scripts/fact.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ def fact(n):
1717
# Treat even factors special, so we can use i = i+2 later
1818
while n%2 == 0:
1919
res.append(2)
20-
n = n/2
20+
n = n//2
2121
# Try odd numbers up to sqrt(n)
2222
limit = sqrt(float(n+1))
2323
i = 3
2424
while i <= limit:
2525
if n%i == 0:
2626
res.append(i)
27-
n = n/i
27+
n = n//i
2828
limit = sqrt(n+1)
2929
else:
3030
i = i+2

‎Demo/scripts/ftpstats.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def main():
104104

105105
def showbar(dict, title):
106106
n = len(title)
107-
print '='*((70-n)/2), title, '='*((71-n)/2)
107+
print '='*((70-n)//2), title, '='*((71-n)//2)
108108
list = []
109109
keys = dict.keys()
110110
keys.sort()
@@ -126,7 +126,7 @@ def show(dict, title, maxitems):
126126
if len(dict) > maxitems:
127127
title = title + ' (first %d)'%maxitems
128128
n = len(title)
129-
print '='*((70-n)/2), title, '='*((71-n)/2)
129+
print '='*((70-n)//2), title, '='*((71-n)//2)
130130
list = []
131131
keys = dict.keys()
132132
for key in keys:

‎Demo/scripts/lpwatch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def makestatus(name, thisuser):
8383
lines.append(line)
8484
#
8585
if totaljobs:
86-
line = '%d K' % ((totalbytes+1023)/1024)
86+
line = '%d K' % ((totalbytes+1023)//1024)
8787
if totaljobs <> len(users):
8888
line = line + ' (%d jobs)' % totaljobs
8989
if len(users) == 1:
@@ -95,7 +95,7 @@ def makestatus(name, thisuser):
9595
line = line + ' (%s first)' % thisuser
9696
else:
9797
line = line + ' (%d K before %s)' % (
98-
(aheadbytes+1023)/1024, thisuser)
98+
(aheadbytes+1023)//1024, thisuser)
9999
lines.append(line)
100100
#
101101
sts = pipe.close()

‎Demo/scripts/markov.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def test():
110110
def tuple(list):
111111
if len(list) == 0: return ()
112112
if len(list) == 1: return (list[0],)
113-
i = len(list)/2
113+
i = len(list)//2
114114
return tuple(list[:i]) + tuple(list[i:])
115115

116116
if __name__ == "__main__":

‎Demo/scripts/pi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ def main():
1717
p, q, k = k*k, 2L*k+1L, k+1L
1818
a, b, a1, b1 = a1, b1, p*a+q*a1, p*b+q*b1
1919
# Print common digits
20-
d, d1 = a/b, a1/b1
20+
d, d1 = a//b, a1//b1
2121
while d == d1:
2222
output(d)
2323
a, a1 = 10L*(a%b), 10L*(a1%b1)
24-
d, d1 = a/b, a1/b1
24+
d, d1 = a//b, a1//b1
2525

2626
def output(d):
2727
# Use write() to avoid spaces between the digits

‎Demo/scripts/unbirthday.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ def mkdate((year, month, day)):
9292
# even though that day never actually existed and the calendar
9393
# was different then...
9494
days = year*365 # years, roughly
95-
days = days + (year+3)/4 # plus leap years, roughly
96-
days = days - (year+99)/100 # minus non-leap years every century
97-
days = days + (year+399)/400 # plus leap years every 4 centirues
95+
days = days + (year+3)//4 # plus leap years, roughly
96+
days = days - (year+99)//100 # minus non-leap years every century
97+
days = days + (year+399)//400 # plus leap years every 4 centirues
9898
for i in range(1, month):
9999
if i == 2 and calendar.isleap(year):
100100
days = days + 29

‎Demo/sockets/ftp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def sendportcmd(s, f, port):
9191
hostname = gethostname()
9292
hostaddr = gethostbyname(hostname)
9393
hbytes = string.splitfields(hostaddr, '.')
94-
pbytes = [repr(port/256), repr(port%256)]
94+
pbytes = [repr(port//256), repr(port%256)]
9595
bytes = hbytes + pbytes
9696
cmd = 'PORT ' + string.joinfields(bytes, ',')
9797
s.send(cmd + '\r\n')

‎Demo/tkinter/guido/hanoi.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ def __init__(self, n, bitmap = None):
3535

3636
# Add background bitmap
3737
if bitmap:
38-
self.bitmap = c.create_bitmap(width/2, height/2,
38+
self.bitmap = c.create_bitmap(width//2, height//2,
3939
bitmap=bitmap,
4040
foreground='blue')
4141

4242
# Generate pegs
4343
pegwidth = 10
44-
pegheight = height/2
45-
pegdist = width/3
46-
x1, y1 = (pegdist-pegwidth)/2, height*1/3
44+
pegheight = height//2
45+
pegdist = width//3
46+
x1, y1 = (pegdist-pegwidth)//2, height*1//3
4747
x2, y2 = x1+pegwidth, y1+pegheight
4848
self.pegs = []
4949
p = c.create_rectangle(x1, y1, x2, y2, fill='black')
@@ -57,14 +57,14 @@ def __init__(self, n, bitmap = None):
5757
self.tk.update()
5858

5959
# Generate pieces
60-
pieceheight = pegheight/16
61-
maxpiecewidth = pegdist*2/3
60+
pieceheight = pegheight//16
61+
maxpiecewidth = pegdist*2//3
6262
minpiecewidth = 2*pegwidth
6363
self.pegstate = [[], [], []]
6464
self.pieces = {}
65-
x1, y1 = (pegdist-maxpiecewidth)/2, y2-pieceheight-2
65+
x1, y1 = (pegdist-maxpiecewidth)//2, y2-pieceheight-2
6666
x2, y2 = x1+maxpiecewidth, y1+pieceheight
67-
dx = (maxpiecewidth-minpiecewidth) / (2*max(1, n-1))
67+
dx = (maxpiecewidth-minpiecewidth) // (2*max(1, n-1))
6868
for i in range(n, 0, -1):
6969
p = c.create_rectangle(x1, y1, x2, y2, fill='red')
7070
self.pieces[i] = p
@@ -101,10 +101,10 @@ def report(self, i, a, b):
101101

102102
# Move it towards peg b
103103
bx1, by1, bx2, by2 = c.bbox(self.pegs[b])
104-
newcenter = (bx1+bx2)/2
104+
newcenter = (bx1+bx2)//2
105105
while 1:
106106
x1, y1, x2, y2 = c.bbox(p)
107-
center = (x1+x2)/2
107+
center = (x1+x2)//2
108108
if center == newcenter: break
109109
if center > newcenter: c.move(p, -1, 0)
110110
else: c.move(p, 1, 0)

0 commit comments

Comments
 (0)
X Tutup