1 files changed, 178 insertions, 178 deletions
diff --git a/dns/bundy/pkg-plist b/dns/bundy/pkg-plist
index 9471b064cf27..b74b1623f06d 100644
--- a/dns/bundy/pkg-plist
+++ b/dns/bundy/pkg-plist
@@ -464,139 +464,139 @@ lib/libbundy-util.a
 lib/libbundy-util.so
 lib/libbundy-util.so.0
 lib/libbundy-util.so.0.0.0
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/acl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.a
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.so
 %%PYTHON_SITELIBDIR%%/bundy/acl/acl.a
 %%PYTHON_SITELIBDIR%%/bundy/acl/acl.so
 %%PYTHON_SITELIBDIR%%/bundy/acl/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/bundy/component.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/sockcreator.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/socket_cache.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/special_component.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/data.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/message.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/proto_defs.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/session.py
 %%PYTHON_SITELIBDIR%%/bundy/config/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/config/ccsession.py
 %%PYTHON_SITELIBDIR%%/bundy/config/cfgmgr.py
 %%PYTHON_SITELIBDIR%%/bundy/config/config_data.py
 %%PYTHON_SITELIBDIR%%/bundy/config/module_spec.py
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.a
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.so
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/sqlite3_ds.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/ddns/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/session.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/zone_config.py
 %%PYTHON_SITELIBDIR%%/bundy/dns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/log.a
 %%PYTHON_SITELIBDIR%%/bundy/log.so
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cfgmgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cmdctl_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/config_messages.py
@@ -619,47 +619,47 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/xfrout_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/zonemgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/builder.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/datasrc_info.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/net/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/net/addr.py
 %%PYTHON_SITELIBDIR%%/bundy/net/parse.py
 %%PYTHON_SITELIBDIR%%/bundy/notify/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/notify/notify_out.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/server_common/auth_command.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/bundy_server.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/datasrc_clients_mgr.py
@@ -667,37 +667,37 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/server_common/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/tsig_keyring.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/statistics/counters.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/sysinfo.py
 %%PYTHON_SITELIBDIR%%/bundy/util/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/address_formatter.py
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.a
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.so
 %%PYTHON_SITELIBDIR%%/bundy/util/file.py
@@ -705,27 +705,27 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/util/socketserver_mixin.py
 %%PYTHON_SITELIBDIR%%/bundy/util/traceback_handler.py
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/diff.py
 %%PYTHON_SITELIBDIR%%/bundy_config.py
 %%PYTHON_SITELIBDIR%%/bundyctl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/bindcmd.py
 %%PYTHON_SITELIBDIR%%/bundyctl/cmdparse.py
 %%PYTHON_SITELIBDIR%%/bundyctl/command_sets.py
@@ -783,12 +783,12 @@ sbin/bundy
 sbin/bundy-cmdctl-usermgr
 %%DATADIR%%/auth.spec
 %%DATADIR%%/cmdctl.spec
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
 %%DATADIR%%/config_plugins/bundylogging.py
 %%DATADIR%%/config_plugins/datasrc.spec
 %%DATADIR%%/config_plugins/datasrc_config_plugin.py