some other fixes

couchapp/autopush/command.py

@@ -144,7 +144,7 @@ def run(self):
                 log.info("unhandled exception in main loop:\n%s" %
                         traceback.format_exc())
                 sys.exit(-1)
-        observer.join()
+        self.observer.join()
 
     def halt(self):
         self.observer.stop()

couchapp/autopush/watchdog/observers/kqueue.py

@@ -83,8 +83,7 @@
 """
 
 from __future__ import with_statement
-from ..utils import \
-    platform #, has_attribute
+from ..utils import platform
 
 if platform.is_bsd() or platform.is_darwin():
     import threading
@@ -94,8 +93,6 @@
     import os
 
     # See the notes for this module in the documentation above ^.
-    #import select
-    #if not has_attribute(select, 'kqueue') or sys.version_info < (2, 7, 0):
     if sys.version_info < (2, 7, 0):
         import couchapp.autopush._select as select
     else:

couchapp/util.py

@@ -8,6 +8,7 @@
 import codecs
 from hashlib import md5
 import imp
+import inspect
 import logging
 import os
 import re
@@ -396,7 +397,7 @@ def expandpath(path):
 def load_py(uri, cfg):
     if os.path.exists(uri):
         name, ext = os.path.splitext(os.path.basename(uri))
-        script = imp.load_source(name, self.script_uri)
+        script = imp.load_source(name, uri)
     else:
         if ":" in uri:
             parts = uri.rsplit(":", 1)
@@ -418,7 +419,7 @@ class ShellScript(object):
     scripts in any languages """
 
     def __init__(self, cmd):
-        self.cmd = uri
+        self.cmd = cmd
 
     def hook(self, *args, **options):
         cmd = self.cmd + " "