summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-09-27 22:04:16 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-09-27 22:04:16 (GMT)
commit3a53fbbfcf2785ff5ed738a0e592973a7dae1dfc (patch)
treea0c0f6672fed1c38d187170201e95bceeeeeb04a /Lib
parentbe17a117211a4e4cc08573852fedebd5a74d0229 (diff)
downloadcpython-3a53fbbfcf2785ff5ed738a0e592973a7dae1dfc.zip
cpython-3a53fbbfcf2785ff5ed738a0e592973a7dae1dfc.tar.gz
cpython-3a53fbbfcf2785ff5ed738a0e592973a7dae1dfc.tar.bz2
#3911 FTP.makeport was giving bad port numbers
reviewed by Benjamin and Antoine
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ftplib.py2
-rw-r--r--Lib/test/test_ftplib.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index c75b317..42f2bff 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -254,7 +254,7 @@ class FTP:
port number.
'''
hbytes = host.split('.')
- pbytes = [repr(port/256), repr(port%256)]
+ pbytes = [repr(port//256), repr(port%256)]
bytes = hbytes + pbytes
cmd = 'PORT ' + ','.join(bytes)
return self.voidcmd(cmd)
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 10eabba..ae889f9 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -348,7 +348,7 @@ class TestFTPClass(TestCase):
self.client.dir(lambda x: l.append(x))
self.assertEqual(''.join(l), LIST_DATA.replace('\r\n', ''))
- def Xtest_makeport(self):
+ def test_makeport(self):
self.client.makeport()
# IPv4 is in use, just make sure send_eprt has not been used
self.assertEqual(self.server.handler.last_received_cmd, 'port')