Skip to content

Capture struct.error exceptions on value encoding #33

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
Jun 25, 2020
Merged

Capture struct.error exceptions on value encoding #33

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
8 changes: 4 additions & 4 deletions redisgraph_bulk_loader/entity_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def typed_prop_to_binary(prop_val, prop_type):
try:
numeric_prop = int(prop_val)
return struct.pack(format_str + "q", Type.LONG.value, numeric_prop)
except ValueError:
except (ValueError, struct.error):
# TODO ugly, rethink
if prop_type == Type.LONG:
raise SchemaError("Could not parse '%s' as a long" % prop_val)
Expand All @@ -58,7 +58,7 @@ def typed_prop_to_binary(prop_val, prop_type):
numeric_prop = float(prop_val)
if not math.isnan(numeric_prop) and not math.isinf(numeric_prop): # Don't accept non-finite values.
return struct.pack(format_str + "d", Type.DOUBLE.value, numeric_prop)
except ValueError:
except (ValueError, struct.error):
# TODO ugly, rethink
if prop_type == Type.DOUBLE:
raise SchemaError("Could not parse '%s' as a double" % prop_val)
Expand Down Expand Up @@ -97,15 +97,15 @@ def inferred_prop_to_binary(prop_val):
try:
numeric_prop = int(prop_val)
return struct.pack(format_str + "q", Type.LONG.value, numeric_prop)
except ValueError:
except (ValueError, struct.error):
pass

# Try to parse value as a float.
try:
numeric_prop = float(prop_val)
if not math.isnan(numeric_prop) and not math.isinf(numeric_prop): # Don't accept non-finite values.
return struct.pack(format_str + "d", Type.DOUBLE.value, numeric_prop)
except ValueError:
except (ValueError, struct.error):
pass

# If field is 'false' or 'true', it is a boolean.
Expand Down