Skip to content

Commit d235047

Browse files
authored
Fix operator parsing errors (#169)
1 parent ac75a6d commit d235047

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

ldclient/operators.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def _parse_time(input):
5454
log.warning("Couldn't parse timestamp:" + str(input) + " with message: " + str(e))
5555
return None
5656

57-
log.warning("Got unexpected type: " + type(input) + " with value: " + str(input) + " when attempting to parse time")
57+
log.warning("Got unexpected type: " + str(type(input)) + " with value: " + str(input) + " when attempting to parse time")
5858
return None
5959

6060
def _time_operator(u, c, fn):
@@ -69,6 +69,8 @@ def _parse_semver(input):
6969
try:
7070
VersionInfo.parse(input)
7171
return input
72+
except TypeError:
73+
return None
7274
except ValueError as e:
7375
try:
7476
input = _add_zero_version_component(input)

testing/test_operators.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@
5959
[ "before", True, 1000, False ], # wrong type
6060
[ "after", "1970-01-01T00:00:02.500Z", 1000, True ],
6161
[ "after", "1970-01-01 00:00:02.500Z", 1000, False ], # malformed timestamp
62+
[ "after", "1970-01-01T00:00:02+01:00", None, False ],
63+
[ "after", None, "1970-01-01T00:00:02+01:00", False ],
6264
[ "before", "1970-01-01T00:00:02+01:00", 1000, True ],
65+
[ "before", "1970-01-01T00:00:02+01:00", None, False ],
66+
[ "before", None, "1970-01-01T00:00:02+01:00", False ],
6367
[ "before", -1000, 1000, True ],
6468
[ "after", "1970-01-01T00:00:01.001Z", 1000, True ],
6569
[ "after", "1970-01-01T00:00:00-01:00", 1000, True ],
@@ -68,6 +72,8 @@
6872
[ "semVerEqual", "2.0.1", "2.0.1", True ],
6973
[ "semVerEqual", "2.0", "2.0.0", True ],
7074
[ "semVerEqual", "2", "2.0.0", True ],
75+
[ "semVerEqual", 2, "2.0.0", False ],
76+
[ "semVerEqual", "2.0.0", 2, False ],
7177
[ "semVerEqual", "2.0-rc1", "2.0.0-rc1", True ],
7278
[ "semVerLessThan", "2.0.0", "2.0.1", True ],
7379
[ "semVerLessThan", "2.0", "2.0.1", True ],

0 commit comments

Comments
 (0)