ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid passing None to ensure_str

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-11-23 10:28:04 -05:00
parent 729a5a0779
commit 55193f725a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/node.py
View File

@ -81,7 +81,10 @@ def _common_valid_config():
# Add our application versions to the data that Foolscap's LogPublisher
# reports. Foolscap requires native strings.
for thing, things_version in list(get_package_versions().items()):
app_versions.add_version(ensure_str(thing), ensure_str(things_version))
app_versions.add_version(
ensure_str(thing),
ensure_str(things_version) if things_version is not None else None,
)
# group 1 will be addr (dotted quad string), group 3 if any will be portnum (string)
ADDR_RE = re.compile("^([1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*\.[1-9][0-9]*)(:([1-9][0-9]*))?$")