Skip to content

Better path handling in symlink case, use os.path methods/constants #242

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

Merged
merged 1 commit into from
Jul 30, 2018
Merged

Better path handling in symlink case, use os.path methods/constants #242

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
18 changes: 8 additions & 10 deletions pendulum/tz/local_timezone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,31 +201,29 @@ def _get_unix_timezone(_root='/'): # type: (str) -> Timezone
line = line[match.end():]
etctz = line[:end_re.search(line).start()]

parts = list(reversed(etctz.replace(' ', '_').split('/')))
parts = list(reversed(etctz.replace(' ', '_').split(os.path.sep)))
tzpath = []
while parts:
tzpath.insert(0, parts.pop(0))

try:
return Timezone('/'.join(tzpath))
return Timezone(os.path.join(*tzpath))
except InvalidTimezone:
pass

# systemd distributions use symlinks that include the zone name,
# see manpage of localtime(5) and timedatectl(1)
tzpath = os.path.join(_root, 'etc/localtime')
tzpath = os.path.join(_root, 'etc', 'localtime')
if os.path.exists(tzpath) and os.path.islink(tzpath):
tzpath = os.path.realpath(tzpath)
parts = tzpath.split('/')[-2:]
parts = list(reversed(os.path.realpath(tzpath).replace(' ', '_').split(os.path.sep)))
tzpath = []
while parts:
tzpath = '/'.join(parts)
tzpath.insert(0, parts.pop(0))
try:
return Timezone(tzpath)
except (ValueError, IOError, OSError):
return Timezone(os.path.join(*tzpath))
except InvalidTimezone:
pass

parts.pop(0)

# No explicit setting existed. Use localtime
for filename in ('etc/localtime', 'usr/local/etc/localtime'):
tzpath = os.path.join(_root, filename)
Expand Down