rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use get_ident from threading

Browse source
This commit is contained in:
Joel Collins 2019-09-15 14:28:18 +01:00
parent 039b4fd3da
commit a832dfb2f1
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openflexure_microscope/camera/base.py
View file

@ -7,14 +7,6 @@ import logging
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
try:
from greenlet import getcurrent as get_ident
except ImportError:
try:
from thread import get_ident
except ImportError:
from _thread import get_ident
from .capture import CaptureObject, BASE_CAPTURE_PATH, TEMP_CAPTURE_PATH from .capture import CaptureObject, BASE_CAPTURE_PATH, TEMP_CAPTURE_PATH
from openflexure_microscope.utilities import entry_by_id from openflexure_microscope.utilities import entry_by_id
from openflexure_microscope.lock import StrictLock from openflexure_microscope.lock import StrictLock
@ -62,7 +54,7 @@ class CameraEvent(object):
def wait(self, timeout: int = 5): def wait(self, timeout: int = 5):
"""Wait for the next frame (invoked from each client's thread).""" """Wait for the next frame (invoked from each client's thread)."""
ident = get_ident() ident = threading.get_ident()
if ident not in self.events: if ident not in self.events:
# this is a new client # this is a new client
# add an entry for it in the self.events dict # add an entry for it in the self.events dict
@ -92,7 +84,7 @@ class CameraEvent(object):
def clear(self): def clear(self):
"""Clear frame event, once processed.""" """Clear frame event, once processed."""
self.events[get_ident()][0].clear() self.events[threading.get_ident()][0].clear()
class BaseCamera(metaclass=ABCMeta): class BaseCamera(metaclass=ABCMeta):