cleaned up imports

diff --git a/sfa/util/filter.py b/sfa/util/filter.py
index 2a3b895..ada44ba 100644 (file)
--- a/sfa/util/filter.py
+++ b/sfa/util/filter.py
@@ -1,5 +1,3 @@
-# $Id$
-# $URL$

 from types import StringTypes
 try:
     set
 from types import StringTypes
 try:
     set


@@ -8,7 +6,8 @@ except NameError:
     set = Set
 
 import time
     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
  
 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 486332c..ffc816c 100644 (file)
--- a/sfa/util/rspec.py
+++ b/sfa/util/rspec.py
@@ -1,14 +1,11 @@
-### $Id$
-### $URL$
-

 import sys
 import pprint
 import os
 import sys
 import pprint
 import os

+from StringIO import StringIO
+from types import StringTypes, ListType

 import httplib
 from xml.dom import minidom
 import httplib
 from xml.dom import minidom

-from types import StringTypes, ListType

 from lxml import etree
 from lxml import etree

-from StringIO import StringIO

 
 from sfa.util.sfalogging import sfa_logger
 
 
 from sfa.util.sfalogging import sfa_logger
 

diff --git a/sfa/util/table.py b/sfa/util/table.py
index 44d0b86..1b43a33 100644 (file)
--- 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?
 
 #
 # 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 *
 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 95d2038..70d7206 100644 (file)
--- a/sfatables/commands/List.py
+++ b/sfatables/commands/List.py
@@ -1,6 +1,5 @@
 import os, time
 import libxml2
 import os, time
 import libxml2

-import pdb

 
 from sfatables.globals import *
 from sfatables.pretty import Pretty
 
 from sfatables.globals import *
 from sfatables.pretty import Pretty

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index a536335..99226f4 100644 (file)
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -3,9 +3,10 @@
 import sys
 import os
 import pdb
 import sys
 import os
 import pdb

+from optparse import OptionParser
+

 import libxml2
 
 import libxml2
 

-from optparse import OptionParser

 from sfatables import commands
 from sfatables.globals import *
 from sfatables.commands.List import *
 from sfatables import commands
 from sfatables.globals import *
 from sfatables.commands.List import *