Skip to content

Better support macOS, where /usr/share/zoneinfo/posix doesn't exist #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better support macOS, where /usr/share/zoneinfo/posix doesn't exist #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions datetime_tz/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import os.path
import re
import sys
import struct
import time
import warnings
import dateutil.parser
Expand Down Expand Up @@ -256,17 +257,23 @@ def _detect_timezone_etc_timezone():

def _load_local_tzinfo():
"""Load zoneinfo from local disk."""
tzdir = os.environ.get("TZDIR", "/usr/share/zoneinfo/posix")
if os.path.exists("/usr/share/zoneinfo/posix"):
_tzdir = "/usr/share/zoneinfo/posix"
else:
_tzdir = "/usr/share/zoneinfo"
tzdir = os.environ.get("TZDIR", _tzdir)

localtzdata = {}
for dirpath, _, filenames in os.walk(tzdir):
for filename in filenames:
filepath = os.path.join(dirpath, filename)
name = os.path.relpath(filepath, tzdir)

f = open(filepath, "rb")
tzinfo = pytz.tzfile.build_tzinfo(name, f)
f.close()
with open(filepath, "rb") as f:
try:
tzinfo = pytz.tzfile.build_tzinfo(name, f)
except (AssertionError, struct.error):
continue
localtzdata[name] = tzinfo

return localtzdata
Expand All @@ -276,9 +283,8 @@ def _detect_timezone_etc_localtime():
"""Detect timezone based on /etc/localtime file."""
matches = []
if os.path.exists("/etc/localtime"):
f = open("/etc/localtime", "rb")
localtime = pytz.tzfile.build_tzinfo("/etc/localtime", f)
f.close()
with open("/etc/localtime", "rb") as f:
localtime = pytz.tzfile.build_tzinfo("/etc/localtime", f)

# We want to match against the local database because /etc/localtime will
# be copied from that. Once we have found a name for /etc/localtime, we can
Expand Down
12 changes: 8 additions & 4 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@

FMT = "%Y-%m-%d %H:%M:%S %Z%z"

if sys.platform == "darwin":
TZDIR_POSIX = "/usr/share/zoneinfo"
else:
TZDIR_POSIX = "/usr/share/zoneinfo/posix"

# Older versions of pytz only have AmbiguousTimeError, while newer versions
# throw NonExistentTimeError.
Expand Down Expand Up @@ -307,7 +311,7 @@ def os_path_exists_fake(filename, os_path_exists=os.path.exists):
os_walk = os.walk
def os_walk_fake(dirname, *args, **kw):
if dirname in (
"/usr/share/zoneinfo/posix",
TZDIR_POSIX,
):
return [
(dirname, ["Etc", "Australia"], []),
Expand All @@ -323,13 +327,13 @@ def localtime_valid_fake(filename, *args, **kw):
filename = os.path.join(os.path.dirname(__file__),
localtime_file)
if filename in (
"/usr/share/zoneinfo/posix/Australia/Melbourne",
"/usr/share/zoneinfo/posix/Australia/Sydney",
os.path.join(TZDIR_POSIX, "Australia/Melbourne"),
os.path.join(TZDIR_POSIX, "Australia/Sydney"),
):
filename = test_zonedata_sydney

if filename in (
"/usr/share/zoneinfo/posix/Etc/UTC",
os.path.join(TZDIR_POSIX, "Etc/UTC"),
):
filename = os.path.join(os.path.dirname(__file__),
"test_zonedata_utc")
Expand Down