mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 10:18:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4067 from audeoudh/1.1-maint

Browse source 
Forward the `format_spec` to `datetime` class (1.1 backport)
This commit is contained in:
TW 2018-08-30 12:33:23 +02:00 committed by GitHub
commit ac7bfec4a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/helpers.py
View file

@ -747,11 +747,11 @@ def safe_timestamp(item_timestamp_ns):
return datetime.fromtimestamp(t_ns / 1e9) return datetime.fromtimestamp(t_ns / 1e9)
def format_time(ts: datetime): def format_time(ts: datetime, format_spec=''):
""" """
Convert *ts* to a human-friendly format with textual weekday. Convert *ts* to a human-friendly format with textual weekday.
""" """
return ts.strftime('%a, %Y-%m-%d %H:%M:%S') return ts.strftime('%a, %Y-%m-%d %H:%M:%S' if format_spec == '' else format_spec)
def isoformat_time(ts: datetime): def isoformat_time(ts: datetime):
@ -786,7 +786,7 @@ def __init__(self, ts: datetime):
self.ts = ts self.ts = ts
def __format__(self, format_spec): def __format__(self, format_spec):
return format_time(self.ts) return format_time(self.ts, format_spec=format_spec)
def __str__(self): def __str__(self):
return '{}'.format(self) return '{}'.format(self)