diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2008-04-08 20:15:14 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2008-04-08 20:15:14 +0200 |
| commit | c1710a1f1b2498670ba2af2eaada1ff4b54fc876 (patch) | |
| tree | bc0361079e737d3b689f6b3a8f8306c1a3db96a9 /portato | |
| parent | ba909e6b8972438cc22298301f4528d325703ceb (diff) | |
| download | portato-c1710a1f1b2498670ba2af2eaada1ff4b54fc876.tar.gz portato-c1710a1f1b2498670ba2af2eaada1ff4b54fc876.tar.bz2 portato-c1710a1f1b2498670ba2af2eaada1ff4b54fc876.zip | |
Now recognize local shm module
Diffstat (limited to '')
| -rwxr-xr-x | portato.py | 9 | ||||
| -rw-r--r-- | portato/plistener.py | 9 |
2 files changed, 12 insertions, 6 deletions
@@ -75,10 +75,13 @@ def main (): else: # start us again in root modus and launch listener - try: - import shm_wrapper as shm + try: # local version + from _shm import shm_wrapper as shm except ImportError: - from portato._shm import shm_wrapper as shm + try: # version installed together with portato + from portato._shm import shm_wrapper as shm + except ImportError: # the normal shm module + import shm_wrapper as shm mem = shm.create_memory(1024, permissions=0600) sig = shm.create_semaphore(InitialValue = 0, permissions = 0600) diff --git a/portato/plistener.py b/portato/plistener.py index 2e35ccb..848e71e 100644 --- a/portato/plistener.py +++ b/portato/plistener.py @@ -91,10 +91,13 @@ class PListener (object): self._sig = None self._rw = None else: - try: - import shm_wrapper as shm + try: # local version + from _shm import shm_wrapper as shm except ImportError: - from portato._shm import shm_wrapper as shm + try: # version installed together with portato + from portato._shm import shm_wrapper as shm + except ImportError: # the normal shm module + import shm_wrapper as shm self._mem = shm.SharedMemoryHandle(mem) self._sig = shm.SemaphoreHandle(sig) |