Replace uuid().hex with just uuid()

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")
 

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

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

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:

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,

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: