From 85aeb49144edc61797a2c60777d66f1c80e5e5e3 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 24 Apr 2013 10:50:45 -0700 Subject: [PATCH] Don't avoid IPv6 when looking for new tzdata. Our internal IPv6 FTP networking problems have been fixed. Change-Id: I9949a13fa20a3b0f3845e565e1461320078d3f14 --- libc/tools/zoneinfo/update-tzdata.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libc/tools/zoneinfo/update-tzdata.py b/libc/tools/zoneinfo/update-tzdata.py index f06dac341..8956136a5 100755 --- a/libc/tools/zoneinfo/update-tzdata.py +++ b/libc/tools/zoneinfo/update-tzdata.py @@ -6,7 +6,6 @@ import ftplib import httplib import os import re -import socket import subprocess import sys import tarfile @@ -33,14 +32,6 @@ regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'northamerica', 'southamerica'] -def DisableIpv6(): - """Replaces socket.getaddrinfo with a version that only requests IPv4 addresses.""" - __real_getaddrinfo = socket.getaddrinfo - def __ipv4_getaddrinfo(host, port, family=0, socktype=0, proto=0, flags=0): - return __real_getaddrinfo(host, port, socket.AF_INET, socktype, proto, flags) - socket.getaddrinfo = __ipv4_getaddrinfo - - def GetCurrentTzDataVersion(): return open('%s/tzdata' % bionic_libc_zoneinfo_dir).read().split('\x00', 1)[0] @@ -159,7 +150,6 @@ def main(): # The FTP server lets you download intermediate releases, and also lets you # download the signatures for verification, so it's your best choice. use_ftp = True - DisableIpv6() # I've been unable to talk to the FTP server over IPv6 (2013-04). if use_ftp: ftp = ftplib.FTP('ftp.iana.org')