summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
Diffstat (limited to 'portato')
-rw-r--r--portato/plistener.py9
1 files changed, 6 insertions, 3 deletions
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)
/td>-1/+4 2014-03-18Do not compress passwords.Jason A. Donenfeld1-1/+1 2013-09-14Use a glob in the pattern match instead of using two comparisons for [yY].Chris Down1-1/+1 2013-09-14Rephrase awkward/confusing message about enabling echo during password entry.Chris Down1-3/+3 2013-09-14Fix directory traversal for reencryption when $PREFIX is a symlinkBrian Shore1-1/+1 2013-08-26Makefile: Do not install bash completion to /etcLukas Fleischer1-3/+2 2013-05-22check if a passfile exists before checking for directoryBrian Mattern1-13/+12