/mandos/trunk : revision 1170

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

Committer: Teddy Hogeborn
Date: 2019-08-30 21:10:13 UTC
Revision ID: teddy@recompile.se-20190830211013-7bt0qseq97dpt7oy

Update Python 3 compatibility

* mandos (rfc3339_duration_to_delta): Change doctest string to not
                                      depend on exact repr() string
                                      representation of values and
                                      instead do value comparisons.
  (string_to_delta): - '' -

files modified:
mandos

Show diffs side-by-side

added added

removed removed

mandos

2765

def rfc3339_duration_to_delta(duration):

2766

"""Parse an RFC 3339 "duration" and return a datetime.timedelta

2767

2768

>>> rfc3339_duration_to_delta("P7D")

2769

datetime.timedelta(7)

2770

>>> rfc3339_duration_to_delta("PT60S")

2771

datetime.timedelta(0, 60)

2772

>>> rfc3339_duration_to_delta("PT60M")

2773

datetime.timedelta(0, 3600)

2774

>>> rfc3339_duration_to_delta("PT24H")

2775

datetime.timedelta(1)

2776

>>> rfc3339_duration_to_delta("P1W")

2777

datetime.timedelta(7)

2778

>>> rfc3339_duration_to_delta("PT5M30S")

2779

datetime.timedelta(0, 330)

2780

>>> rfc3339_duration_to_delta("P1DT3M20S")

2781

datetime.timedelta(1, 200)

2768

>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)

2769

True

2770

>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)

2771

True

2772

>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)

2773

True

2774

>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)

2775

True

2776

>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)

2777

True

2778

>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)

2779

True

2780

>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)

2781

True

2782

"""

2783

2784

# Parsing an RFC 3339 duration with regular expressions is not

2864

def string_to_delta(interval):

2865

"""Parse a string and return a datetime.timedelta

2866

2867

>>> string_to_delta('7d')

2868

datetime.timedelta(7)

2869

>>> string_to_delta('60s')

2870

datetime.timedelta(0, 60)

2871

>>> string_to_delta('60m')

2872

datetime.timedelta(0, 3600)

2873

>>> string_to_delta('24h')

2874

datetime.timedelta(1)

2875

>>> string_to_delta('1w')

2876

datetime.timedelta(7)

2877

>>> string_to_delta('5m 30s')

2878

datetime.timedelta(0, 330)

2867

>>> string_to_delta('7d') == datetime.timedelta(7)

2868

True

2869

>>> string_to_delta('60s') == datetime.timedelta(0, 60)

2870

True

2871

>>> string_to_delta('60m') == datetime.timedelta(0, 3600)

2872

True

2873

>>> string_to_delta('24h') == datetime.timedelta(1)

2874

True

2875

>>> string_to_delta('1w') == datetime.timedelta(7)

2876

True

2877

>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)

2878

True

2879

"""

2880

2881

try:

Older »