From: W. Trevor King <wking@tremily.us>
Date: Tue, 28 Aug 2012 00:52:52 +0000 (-0400)
Subject: util:plugin: modnames() should only list *.py or *.pyc files.
X-Git-Tag: 1.1.0~118
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f8abe6aa77c0bc80f899cbec24cdedb297f28844;p=be.git

util:plugin: modnames() should only list *.py or *.pyc files.

By appending '.py' to *everything*, it was listing '__pycache__' for
Python 3.
---

diff --git a/libbe/util/plugin.py b/libbe/util/plugin.py
index ba563eb..ca5686d 100644
--- a/libbe/util/plugin.py
+++ b/libbe/util/plugin.py
@@ -75,7 +75,9 @@ def modnames(prefix):
     else:
         modfiles = os.listdir(os.path.join(_PLUGIN_PATH, *components))
     # normalize .py/.pyc extensions and sort
-    modfiles = sorted(set(os.path.splitext(f)[0] + '.py' for f in modfiles))
+    base_ext = [os.path.splitext(f) for f in modfiles]
+    modfiles = sorted(set(
+            base + '.py' for base,ext in base_ext if ext in ['.py', '.pyc']))
     for modfile in modfiles:
         if modfile.startswith('.') or not modfile:
             continue # the occasional emacs temporary file or .* file