From: Thierry Parmentelat Date: Tue, 5 Apr 2011 15:27:02 +0000 (+0200) Subject: cleaned up imports X-Git-Tag: sfa-1.0-21-ckp1~74^2~32 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bfcea75fd4f7d91b186f4f0e479db0e6f0a231ae cleaned up imports --- diff --git a/sfa/util/filter.py b/sfa/util/filter.py index 2a3b8953..ada44ba5 100644 --- a/sfa/util/filter.py +++ b/sfa/util/filter.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ from types import StringTypes try: set @@ -8,7 +6,8 @@ except NameError: set = Set import time -import pgdb +try: import pgdb +except: pass from sfa.util.faults import * from sfa.util.parameter import Parameter, Mixed, python_type diff --git a/sfa/util/rspec.py b/sfa/util/rspec.py index 486332c3..ffc816c3 100644 --- a/sfa/util/rspec.py +++ b/sfa/util/rspec.py @@ -1,14 +1,11 @@ -### $Id$ -### $URL$ - import sys import pprint import os +from StringIO import StringIO +from types import StringTypes, ListType import httplib from xml.dom import minidom -from types import StringTypes, ListType from lxml import etree -from StringIO import StringIO from sfa.util.sfalogging import sfa_logger diff --git a/sfa/util/table.py b/sfa/util/table.py index 44d0b869..1b43a339 100644 --- a/sfa/util/table.py +++ b/sfa/util/table.py @@ -1,12 +1,8 @@ -### $Id$ -### $URL$ # # implements support for SFA records stored in db tables # # TODO: Use existing PLC database methods? or keep this separate? -import pgdb - from sfa.util.PostgreSQL import * from sfa.trust.gid import * from sfa.util.record import * diff --git a/sfatables/commands/List.py b/sfatables/commands/List.py index 95d20381..70d72064 100644 --- a/sfatables/commands/List.py +++ b/sfatables/commands/List.py @@ -1,6 +1,5 @@ import os, time import libxml2 -import pdb from sfatables.globals import * from sfatables.pretty import Pretty diff --git a/sfatables/runtime.py b/sfatables/runtime.py index a5363352..99226f4f 100644 --- a/sfatables/runtime.py +++ b/sfatables/runtime.py @@ -3,9 +3,10 @@ import sys import os import pdb +from optparse import OptionParser + import libxml2 -from optparse import OptionParser from sfatables import commands from sfatables.globals import * from sfatables.commands.List import *