Merge branch 'upstreammaster'

[sfa.git] / sfa / util / parameter.py

diff --git a/sfa/util/parameter.py b/sfa/util/parameter.py
index 00d9319..e520bfc 100644 (file)
--- a/sfa/util/parameter.py
+++ b/sfa/util/parameter.py
@@ -4,14 +4,9 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
-
-### $Id$
-### $URL$
 
-from types import *
-from sfa.util.faults import *
+from types import NoneType, IntType, LongType, FloatType, StringTypes, DictType, TupleType, ListType
+from sfa.util.faults import SfaAPIError
 
 class Parameter:
     """