handle missing folders better

getnikola · Dec 24, 2015 · f0aac44 · f0aac44
1 parent ce07d6b
commit f0aac44
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -1297,11 +1297,11 @@ def _register_templated_shortcodes(self):
         """Register shortcodes provided by templates in shortcodes/ folders."""
 
         builtin_sc_dir = resource_filename('nikola', os.path.join('data', 'shortcodes', utils.get_template_engine(self.THEMES)))
-        sc_dirs = [builtin_sc_dir]
-        if os.path.isdir('shortcodes'):
-            sc_dirs.append('shortcodes')
+        sc_dirs = [builtin_sc_dir, 'shortcodes']
 
         for sc_dir in sc_dirs:
+            if not os.path.isdir(sc_dir):
+                continue
             for fname in os.listdir(sc_dir):
                 name, ext = os.path.splitext(fname)
                 if ext == '.tmpl':