Don't catch ImportError from service modules

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>

src/pywws/__init__.py

@@ -1,3 +1,3 @@
 __version__ = '18.5.0'
-_release = '1534'
-_commit = 'b734880'
+_release = '1535'
+_commit = 'ab180a3'

src/pywws/regulartasks.py

@@ -93,30 +93,25 @@ def __init__(self, context):
                     self.cron[section].get_next()
         # create service uploader objects
         self.services = {}
-        sys.path.insert(0, self.module_dir)
         for section in list(self.cron.keys()) + [
                        'live', 'logged', 'hourly', '12 hourly', 'daily']:
             for name in eval(self.params.get(section, 'services', '[]')):
                 if name in self.services:
                     continue
-                mod = None
-                try:
+                if os.path.exists(os.path.join(self.module_dir, name + '.py')):
+                    sys.path.insert(0, self.module_dir)
+                    mod = importlib.import_module(name)
+                    del sys.path[0]
+                else:
                     mod = importlib.import_module('pywws.service.' + name)
-                except ImportError:
-                    try:
-                        mod = importlib.import_module(name)
-                    except ImportError:
-                        logger.error('no uploader found for service "{:s}"'.format(name))
-                if mod:
-                    self.services[name] = mod.ToService(context)
+                self.services[name] = mod.ToService(context)
             # check for obsolete entries
             if self.params.get(section, 'twitter'):
                 logger.error(
                     'Obsolete twitter entry in weather.ini [%s]', section)
             if self.params.get(section, 'yowindow'):
                 logger.error(
                     'Obsolete yowindow entry in weather.ini [%s]', section)
-        del sys.path[0]
         # check for 'local' template results
         if os.path.isdir(self.local_dir):
             return