Skip to content

Commit eac203f

Browse files
committed
Merge branch 'add_logger' of https://github.com/jverswijver/datajoint-python into remove_checksum
2 parents ce4f1b3 + 0274a23 commit eac203f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

datajoint/connection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,15 +380,15 @@ def start_transaction(self):
380380
raise errors.DataJointError("Nested connections are not supported.")
381381
self.query("START TRANSACTION WITH CONSISTENT SNAPSHOT")
382382
self._in_transaction = True
383-
logger.info("Transaction started")
383+
logger.debug("Transaction started")
384384

385385
def cancel_transaction(self):
386386
"""
387387
Cancels the current transaction and rolls back all changes made during the transaction.
388388
"""
389389
self.query("ROLLBACK")
390390
self._in_transaction = False
391-
logger.info("Transaction cancelled. Rolling back ...")
391+
logger.debug("Transaction cancelled. Rolling back ...")
392392

393393
def commit_transaction(self):
394394
"""
@@ -397,7 +397,7 @@ def commit_transaction(self):
397397
"""
398398
self.query("COMMIT")
399399
self._in_transaction = False
400-
logger.info("Transaction committed and closed.")
400+
logger.debug("Transaction committed and closed.")
401401

402402
# -------- context manager for transactions
403403
@property

datajoint/plugin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ def _update_error_stack(plugin_name):
1515
plugin_meta = pkg_resources.get_distribution(plugin_name)
1616

1717
data = hash_pkg(pkgpath=str(Path(plugin_meta.module_path, plugin_name)))
18-
signature = plugin_meta.get_metadata("{}.sig".format(plugin_name))
19-
pubkey_path = str(Path(base_meta.egg_info, "{}.pub".format(base_name)))
18+
signature = plugin_meta.get_metadata(f"{plugin_name}.sig")
19+
pubkey_path = str(Path(base_meta.egg_info, f"{base_name}.pub"))
2020
verify(pubkey_path=pubkey_path, data=data, signature=signature)
21-
logger.info("DataJoint verified plugin `{}` detected.".format(plugin_name))
21+
logger.info(f"DataJoint verified plugin `{plugin_name}` detected.")
2222
return True
2323
except (FileNotFoundError, InvalidSignature):
24-
logger.warning("Unverified plugin `{}` detected.".format(plugin_name))
24+
logger.warning(f"Unverified plugin `{plugin_name}` detected.")
2525
return False
2626

2727

0 commit comments

Comments
 (0)