| {"repo": "magic-wormhole/magic-wormhole", "pull_number": 27, "instance_id": "magic-wormhole__magic-wormhole-27", "issue_numbers": "", "base_commit": "7b0ca28589d86d7e14585bded1fc5113bf75ad71", "patch": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -29,7 +29,7 @@\n \"autobahn[twisted] >= 0.14.1\",\n \"hkdf\", \"tqdm\",\n ],\n- extras_require={\"tor\": [\"txtorcon\", \"ipaddr\"]},\n+ extras_require={\"tor\": [\"txtorcon\", \"ipaddress\"]},\n test_suite=\"wormhole.test\",\n cmdclass=commands,\n )\ndiff --git a/src/wormhole/tor_manager.py b/src/wormhole/tor_manager.py\n--- a/src/wormhole/tor_manager.py\n+++ b/src/wormhole/tor_manager.py\n@@ -3,7 +3,7 @@\n from twisted.internet.defer import inlineCallbacks, returnValue\n from twisted.internet.error import ConnectError\n import txtorcon\n-import ipaddr\n+import ipaddress\n from .timing import DebugTiming\n from .transit import allocate_tcp_port\n \n@@ -112,7 +112,7 @@ def is_non_public_numeric_address(self, host):\n # for numeric hostnames, skip RFC1918 addresses, since no Tor exit\n # node will be able to reach those. Likewise ignore IPv6 addresses.\n try:\n- a = ipaddr.IPAddress(host)\n+ a = ipaddress.ip_address(host)\n except ValueError:\n return False # non-numeric, let Tor try it\n if a.version != 4:\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2016-06-02T19:08:46Z"} | |