Clean up redundant imports reported by pyflakes.

Author: pavoljuhas

diffpy/srfit/fitbase/fitresults.py

@@ -150,7 +150,7 @@ def update(self):
 
         # Calcualte the restraints penalty
         w = self.chi2 / len(res)
-        self.penalty = sum([res.penalty(w) for res in recipe._restraintlist])
+        self.penalty = sum([r.penalty(w) for r in recipe._restraintlist])
 
         return
 

diffpy/srfit/sas/sasparser.py

@@ -19,12 +19,12 @@
 """
 __all__ = ["SASParser"]
 
-import numpy
 
 from diffpy.srfit.exceptions import ParseError
 from diffpy.srfit.fitbase.profileparser import ProfileParser
 from diffpy.srfit.sas.sasimport import sasimport
 
+
 class SASParser(ProfileParser):
     """Class for parsing a sas profile.
 

diffpy/srfit/structure/cctbxparset.py

@@ -28,7 +28,7 @@
 
 """
 
-from diffpy.srfit.fitbase.parameter import Parameter, ParameterAdapter
+from diffpy.srfit.fitbase.parameter import ParameterAdapter
 from diffpy.srfit.fitbase.parameterset import ParameterSet
 from diffpy.srfit.structure.basestructureparset import BaseStructureParSet
 

diffpy/srfit/structure/diffpyparset.py

@@ -30,7 +30,7 @@
 
 __all__ = ["DiffpyStructureParSet"]
 
-from diffpy.srfit.fitbase.parameter import Parameter, ParameterProxy
+from diffpy.srfit.fitbase.parameter import ParameterProxy
 from diffpy.srfit.fitbase.parameter import ParameterAdapter
 from diffpy.srfit.fitbase.parameterset import ParameterSet
 from diffpy.srfit.structure.srrealparset import SrRealParSet

diffpy/srfit/structure/objcrystparset.py

@@ -48,7 +48,6 @@
 from diffpy.srfit.fitbase.parameter import Parameter, ParameterAdapter
 from diffpy.srfit.fitbase.parameter import ParameterProxy
 from diffpy.srfit.fitbase.parameterset import ParameterSet
-from diffpy.srfit.fitbase.restraint import Restraint
 from diffpy.srfit.structure.srrealparset import SrRealParSet
 
 class ObjCrystScattererParSet(ParameterSet):

diffpy/srfit/structure/sgconstraints.py

@@ -18,7 +18,7 @@
 import numpy
 
 from diffpy.srfit.fitbase.recipeorganizer import RecipeContainer
-from diffpy.srfit.fitbase.parameter import Parameter, ParameterProxy
+from diffpy.srfit.fitbase.parameter import ParameterProxy
 
 __all__ = ["constrainAsSpaceGroup"]
 

diffpy/srfit/tests/__init__.py

@@ -56,6 +56,7 @@ def testsuite():
     '''.split()
     suite = unittest.TestSuite()
     loader = unittest.defaultTestLoader
+    mobj = None
     for mname in modulenames:
         exec ('import %s as mobj' % mname)
         suite.addTests(loader.loadTestsFromModule(mobj))

diffpy/srfit/tests/speedtest.py

@@ -387,6 +387,7 @@ def f(b1, b2, b3, b4, b5, b6, b7, b8):
 
 def profileTest():
 
+    from diffpy.srfit.builder import EquationFactory
     factory = EquationFactory()
 
     x = numpy.arange(0, 10, 0.001)

diffpy/srfit/tests/testbuilder.py

@@ -16,7 +16,6 @@
 
 import diffpy.srfit.equation.builder as builder
 import diffpy.srfit.equation.literals as literals
-import diffpy.srfit.equation.visitors as visitors
 
 import unittest
 
@@ -84,7 +83,6 @@ def testRegisterOperator(self):
 
     def testSwapping(self):
 
-        import numpy
         def g1(v1, v2, v3, v4):
             return (v1 + v2) * (v3 + v4)
         def g2(v1):
@@ -144,7 +142,7 @@ def g2(v1):
 
     def testParseEquation(self):
 
-        from numpy import exp, sin, divide, sqrt, array_equal, e
+        from numpy import sin, divide, sqrt, array_equal, e
 
         factory = builder.EquationFactory()
 

diffpy/srfit/tests/testcontribution.py

@@ -182,7 +182,6 @@ def testResidual(self):
         self.assertTrue(fc._reseq._value is None)
         from numpy import sin
         xobs = arange(0, 10, 0.5)
-        from numpy import sin
         yobs = 9*sin(xobs)
         profile.setObservedProfile(xobs, yobs)
         self.assertTrue(fc._eq._value is None)