From f2cd87efc4d91982c932ecb13c19d48980209e7a Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Sat, 22 May 2010 09:49:03 -0700 Subject: [PATCH] applied static imports patch from Ricardo Pedroso --- wx/gui/options/viewer.py | 59 ++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/wx/gui/options/viewer.py b/wx/gui/options/viewer.py index 16758f8..b0e69ac 100644 --- a/wx/gui/options/viewer.py +++ b/wx/gui/options/viewer.py @@ -25,33 +25,52 @@ import os import wx import operator -import imp +#import imp from lib.wordwrap import wordwrap from gui.boldstatictext import BoldStaticText import viewers import gui.fields +import viewers.raw +import viewers.simple +import viewers.rfx +import viewers.flexpaper +import viewers.technoargia + class Viewers: def __init__(self): - self.viewers = [] - self.modules = [] - self.list_viewers() - self.import_viewers() - - def list_viewers(self): - for file in os.listdir('viewers'): - if (file.startswith('.') or file.startswith('_') - or file.endswith(".pyc") or not file.endswith('.py')): - continue - self.viewers.append(os.path.splitext(file)[0]) - - def import_viewers(self): - for file in self.viewers: - try: - _temp = imp.load_source("viewers.%s" % file, os.path.join(os.getcwdu(), "viewers/%s.py" % file)) - self.modules.append(_temp) - except: - print "Could not load %s" % file + self.viewers = [ + 'raw', + 'simple', + 'rfx', + 'flexpaper', + 'technoargia', + ] + self.modules = [ + viewers.raw, + viewers.simple, + viewers.rfx, + viewers.flexpaper, + viewers.technoargia, + ] + + #self.list_viewers() + #self.import_viewers() + + #def list_viewers(self): + # for file in os.listdir('viewers'): + # if (file.startswith('.') or file.startswith('_') + # or file.endswith(".pyc") or not file.endswith('.py')): + # continue + # self.viewers.append(os.path.splitext(file)[0]) + + #def import_viewers(self): + # for file in self.viewers: + # try: + # _temp = imp.load_source("viewers.%s" % file, os.path.join(os.getcwdu(), "viewers/%s.py" % file)) + # self.modules.append(_temp) + # except: + # print "Could not load %s" % file -- 1.7.10.4