From 2b90829020283e8b3041f61f75b25e8db011cd21 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Sat, 28 Dec 2019 18:36:46 +0000 Subject: [PATCH] Replace uuid().hex with just uuid() --- openflexure_microscope/camera/capture.py | 2 +- openflexure_microscope/common/labthings_core/tasks/thread.py | 2 +- openflexure_microscope/microscope.py | 2 +- openflexure_microscope/plugins/default/scan/plugin.py | 4 ++-- openflexure_microscope/plugins/default/zip_builder/plugin.py | 2 +- openflexure_microscope/plugins/v2/scan.py | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openflexure_microscope/camera/capture.py b/openflexure_microscope/camera/capture.py index e45dde80..20ec71da 100644 --- a/openflexure_microscope/camera/capture.py +++ b/openflexure_microscope/camera/capture.py @@ -129,7 +129,7 @@ class CaptureObject(object): """Create a new StreamObject, to manage capture data.""" # Store a nice ID - self.id = uuid.uuid4().hex #: str: Unique capture ID + self.id = uuid.uuid4() #: str: Unique capture ID logging.debug("Created StreamObject {}".format(self.id)) self.timestring = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S") diff --git a/openflexure_microscope/common/labthings_core/tasks/thread.py b/openflexure_microscope/common/labthings_core/tasks/thread.py index fbe97d85..d3b06c34 100644 --- a/openflexure_microscope/common/labthings_core/tasks/thread.py +++ b/openflexure_microscope/common/labthings_core/tasks/thread.py @@ -26,7 +26,7 @@ class TaskThread(threading.Thread): ) # A UUID for the TaskThread (not the same as the threading.Thread ident) - self._ID = uuid.uuid4().hex # Task ID + self._ID = uuid.uuid4() # Task ID # Make _target, _args, and _kwargs available to the subclass self._target = target diff --git a/openflexure_microscope/microscope.py b/openflexure_microscope/microscope.py index de9cf00e..2624d658 100644 --- a/openflexure_microscope/microscope.py +++ b/openflexure_microscope/microscope.py @@ -33,7 +33,7 @@ class Microscope: def __init__(self): # Initial attributes - self.id = uuid.uuid4().hex + self.id = uuid.uuid4() self.name = self.id self.fov = [0, 0] self.camera = None diff --git a/openflexure_microscope/plugins/default/scan/plugin.py b/openflexure_microscope/plugins/default/scan/plugin.py index ac92fc68..0863ff51 100644 --- a/openflexure_microscope/plugins/default/scan/plugin.py +++ b/openflexure_microscope/plugins/default/scan/plugin.py @@ -134,7 +134,7 @@ class ScanPlugin(MicroscopePlugin): basename = generate_basename() # Generate a stack ID - scan_id = uuid.uuid4().hex + scan_id = uuid.uuid4() # Store initial position initial_position = self.microscope.stage.position @@ -288,7 +288,7 @@ class ScanPlugin(MicroscopePlugin): # Generate a stack ID if not scan_id: - scan_id = uuid.uuid4().hex + scan_id = uuid.uuid4() # Add scan metadata if not "time" in metadata: diff --git a/openflexure_microscope/plugins/default/zip_builder/plugin.py b/openflexure_microscope/plugins/default/zip_builder/plugin.py index d6b55a22..545f6a1f 100644 --- a/openflexure_microscope/plugins/default/zip_builder/plugin.py +++ b/openflexure_microscope/plugins/default/zip_builder/plugin.py @@ -123,7 +123,7 @@ class ZipBuilderPlugin(MicroscopePlugin): # Update task progress update_task_progress(int((index / n_files) * 100)) - session_id = uuid.uuid4().hex + session_id = uuid.uuid4() # self.session_zips[session_id] = fp self.session_zips[session_id] = { "id": session_id, diff --git a/openflexure_microscope/plugins/v2/scan.py b/openflexure_microscope/plugins/v2/scan.py index a214ee5a..b75aaa70 100644 --- a/openflexure_microscope/plugins/v2/scan.py +++ b/openflexure_microscope/plugins/v2/scan.py @@ -146,7 +146,7 @@ def tile( basename = generate_basename() # Generate a stack ID - scan_id = uuid.uuid4().hex + scan_id = uuid.uuid4() # Store initial position initial_position = microscope.stage.position @@ -296,7 +296,7 @@ def stack( # Generate a stack ID if not scan_id: - scan_id = uuid.uuid4().hex + scan_id = uuid.uuid4() # Add scan metadata if not "time" in metadata: