diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-09-04 17:13:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-09-04 17:13:18 -0700 |
| commit | 0104d8fa3ce84a4b7484b66e5236082adaeb9464 (patch) | |
| tree | 15cae7ab159423755174f739aa4a3a447b86a887 /gnuradio-core/src/python/gnuradio/gr | |
| parent | 3d2612aee54d1b7f5155a827a72d7529d955c1b3 (diff) | |
| parent | 4180e5efe04aa38997faff5f37352ea1b3c03ea0 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/gr')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/prefs.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-core/src/python/gnuradio/gr/prefs.py index 644aea8483..25fa8cd6ae 100644 --- a/gnuradio-core/src/python/gnuradio/gr/prefs.py +++ b/gnuradio-core/src/python/gnuradio/gr/prefs.py @@ -27,6 +27,7 @@ import ConfigParser import os import os.path import sys +import glob def _user_prefs_filename(): @@ -53,18 +54,18 @@ class _prefs(_prefs_base): invoke the methods in this python class. """ def __init__(self): - _prefs_base.__init__(self) - self.cp = ConfigParser.RawConfigParser() - self.__getattr__ = lambda self, name: getattr(self.cp, name) + _prefs_base.__init__(self) + self.cp = ConfigParser.RawConfigParser() + self.__getattr__ = lambda self, name: getattr(self.cp, name) def _sys_prefs_filenames(self): dir = _sys_prefs_dirname() try: - fnames = os.listdir(dir) + fnames = glob.glob(os.path.join(dir, '*.conf')) except (IOError, OSError): return [] fnames.sort() - return [os.path.join(dir, f) for f in fnames] + return fnames def _read_files(self): filenames = self._sys_prefs_filenames() |