summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-05-02 15:05:39 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-05-02 15:05:39 +0200
commit287b37a3d437f5ebc44770819adbb5daca2d3449 (patch)
treedbf615423ff02e604fd5466253d4284a958353b8 /portato
parent496036eaf6faac0f32e8d746f1d8b34f460cedb0 (diff)
downloadportato-287b37a3d437f5ebc44770819adbb5daca2d3449.tar.gz
portato-287b37a3d437f5ebc44770819adbb5daca2d3449.tar.bz2
portato-287b37a3d437f5ebc44770819adbb5daca2d3449.zip
Use only global shm
Diffstat (limited to '')
-rwxr-xr-xportato.py8
-rw-r--r--portato/plistener.py8
2 files changed, 2 insertions, 14 deletions
diff --git a/portato.py b/portato.py
index 9a068ad..a4f871a 100755
--- a/portato.py
+++ b/portato.py
@@ -73,13 +73,7 @@ def main ():
else: # start us again in root modus and launch listener
- try: # local version
- from _shm import shm_wrapper as shm
- except ImportError:
- 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
+ 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 1a5197a..8d35ece 100644
--- a/portato/plistener.py
+++ b/portato/plistener.py
@@ -90,13 +90,7 @@ class PListener (object):
self._sig = None
self._rw = None
else:
- try: # local version
- from _shm import shm_wrapper as shm
- except ImportError:
- 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
+ import shm_wrapper as shm
self._mem = shm.SharedMemoryHandle(mem)
self._sig = shm.SemaphoreHandle(sig)