Avoiding load errors

magmax · magmax · commit 468aad2d10bf · 2014-06-04T08:58:23.000+02:00
diff --git a/pluginloader/__init__.py b/pluginloader/__init__.py
@@ -4,6 +4,9 @@
 __description__ = 'Library to manage plugins/extensions in your applications.'
 
 import os
+import logging
+
+logger = logging.getLogger('pluginloader')
 
 
 class PluginFactory(object):
@@ -19,14 +22,17 @@ def __init__(self):
         self.plugins = {}
 
     def load_file(self, filename, onlyif=None, context=None):
-        onlyif = self._default_condition if onlyif is None else onlyif
-        context = context or {}
-        with open(filename) as fd:
-            exec(fd.read(), context)
-
-        for name, clazz in context.items():
-            if (self._apply_condition(onlyif, name, clazz)):
-                self.plugins[name] = PluginFactory(clazz)
+        try:
+            onlyif = self._default_condition if onlyif is None else onlyif
+            context = context or {}
+            with open(filename) as fd:
+                exec(fd.read(), context)
+
+            for name, clazz in context.items():
+                if (self._apply_condition(onlyif, name, clazz)):
+                    self.plugins[name] = PluginFactory(clazz)
+        except:
+            logger.exception('Error loading file %s. Ignored' % filename)
 
     def load_directory(self, path, onlyif=None, recursive=False, context=None):
         for filename in os.listdir(path):
diff --git a/tests/integration/test_file_loader.py b/tests/integration/test_file_loader.py
@@ -121,3 +121,12 @@ class Pattern(object):
 
         self.assertEqual(sorted(['Foo', 'Bar']),
                          sorted(list(sut.plugins.keys())))
+
+    def test_binary_files_are_ignored(self):
+        self.plugin_file.write('\0\1\2\3\4\5\6\7')
+        self.plugin_file.flush()
+        sut = PluginLoader()
+
+        sut.load_file(self.plugin_file.name)
+
+        self.assertEqual([], list(sut.plugins.keys()))
