summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorNecoro <>2007-10-22 22:17:48 +0000
committerNecoro <>2007-10-22 22:17:48 +0000
commit6d862d7a961ce70bc24450aadc99a901e5ab19c8 (patch)
tree7873eb36ea29dffd5f87e3131200e41128b1a012 /portato
parent6164e60388eed0f30a705e552e25e7c2b058550c (diff)
downloadportato-6d862d7a961ce70bc24450aadc99a901e5ab19c8.tar.gz
portato-6d862d7a961ce70bc24450aadc99a901e5ab19c8.tar.bz2
portato-6d862d7a961ce70bc24450aadc99a901e5ab19c8.zip
bundled shm module
Diffstat (limited to '')
-rwxr-xr-xportato.py5
-rw-r--r--portato/plistener.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/portato.py b/portato.py
index 3bf9ab6..4019504 100755
--- a/portato.py
+++ b/portato.py
@@ -18,7 +18,10 @@ import sys, os, subprocess
import gettext, locale
from optparse import OptionParser, SUPPRESS_HELP
-import shm_wrapper as shm
+try:
+ import shm_wrapper as shm
+except ImportError:
+ from portato.shm import shm_wrapper as shm
from portato import listener
from portato.constants import VERSION, FRONTENDS, STD_FRONTEND, XSD_LOCATION, LOCALE_DIR, APP, SU_COMMAND
diff --git a/portato/plistener.py b/portato/plistener.py
index 291a30c..a96f4b2 100644
--- a/portato/plistener.py
+++ b/portato/plistener.py
@@ -12,12 +12,16 @@
from __future__ import absolute_import
-import shm_wrapper as shm
import os
from subprocess import Popen
from gettext import lgettext as _
try:
+ import shm_wrapper as shm
+except ImportError:
+ from portato.shm import shm_wrapper as shm
+
+try:
import pynotify
except ImportError:
pynotify = None