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)

diffpy/srfit/tests/testliterals.py

@@ -145,8 +145,6 @@ class TestConvolutionOperator(unittest.TestCase):
     def testValue(self):
         """Make sure the convolution operator is working properly."""
 
-        import numpy
-        pi = numpy.pi
         exp = numpy.exp
 
         x = numpy.linspace(0, 10, 1000)

diffpy/srfit/tests/testobjcrystparset.py

@@ -374,7 +374,6 @@ def testExplicitDihedralAngleRestraints(self):
     def testExplicitBondLengthParameter(self):
         """Test adding bond length parameters to the molecule."""
         occryst = self.occryst
-        ocmol = self.ocmol
 
         # make our crystal
         cryst = ObjCrystCrystalParSet("bucky", occryst)
@@ -435,7 +434,6 @@ def testExplicitBondLengthParameter(self):
     def testExplicitBondAngleParameter(self):
         """Test adding bond angle parameters to the molecule."""
         occryst = self.occryst
-        ocmol = self.ocmol
 
         # make our crystal
         cryst = ObjCrystCrystalParSet("bucky", occryst)
@@ -503,7 +501,6 @@ def testExplicitBondAngleParameter(self):
     def testExplicitDihedralAngleParameter(self):
         """Test adding dihedral angle parameters to the molecule."""
         occryst = self.occryst
-        ocmol = self.ocmol
 
         # make our crystal
         cryst = ObjCrystCrystalParSet("bucky", occryst)
@@ -631,9 +628,8 @@ def xtestCreateSpaceGroup(self):
             if SpaceGroups.IsSpaceGroupIdentifier(short_name):
                 sg = SpaceGroups.GetSpaceGroup(shn)
                 sgnew = self.getObjCrystParSetSpaceGroup(sg)
-                equiv = self.sgsEquivalent(sg, sgnew)
                 # print "dbsg: " + repr(self.sgsEquivalent(sg, sgnew))
-                self.assertTrue( self.sgsEquivalent(sg, sgnew) )
+                self.assertTrue(self.sgsEquivalent(sg, sgnew))
         return
 
 

diffpy/srfit/tests/testparameter.py

@@ -12,11 +12,13 @@
 # See LICENSE_DANSE.txt for license information.
 #
 ##############################################################################
+
 """Tests for refinableobj module."""
 
 import unittest
 
-from diffpy.srfit.fitbase.parameter import *
+from diffpy.srfit.fitbase.parameter import Parameter
+from diffpy.srfit.fitbase.parameter import ParameterAdapter, ParameterProxy
 
 class TestParameter(unittest.TestCase):
 

diffpy/srfit/tests/testpdf.py

@@ -18,7 +18,6 @@
 
 import numpy
 
-from diffpy.srfit.fitbase import Profile
 from diffpy.srfit.tests.utils import datafile
 from diffpy.srfit.tests.utils import testoptional
 from diffpy.srfit.tests.utils import TestCasePDF, TestCaseStructure

diffpy/srfit/tests/testsas.py

@@ -30,8 +30,6 @@ def testParser(self):
         parser = SASParser()
         parser.parseFile(data)
 
-        meta = parser._meta
-
         x, y, dx, dy = parser.getData()
 
         testx = numpy.array([0.002618, 0.007854, 0.01309, 0.01832, 0.02356,

diffpy/srfit/tests/testsgconstriants.py

@@ -34,7 +34,6 @@ def makeLaMnO3_P1():
 def makeLaMnO3():
     from pyobjcryst.crystal import Crystal
     from pyobjcryst.atom import Atom
-    from pyobjcryst.molecule import Molecule
     from pyobjcryst.scatteringpower import ScatteringPowerAtom
 
     pi = numpy.pi

diffpy/srfit/util/_ordereddict.py

@@ -6,7 +6,7 @@
 
 __all__ = ["OrderedDict"]
 
-from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
+from itertools import repeat as _repeat, chain as _chain
 
 
 try:

diffpy/srfit/util/tagmanager.py

@@ -20,7 +20,6 @@
 """
 __all__ = ["TagManager"]
 
-import re
 
 class TagManager(object):
     """TagManager class.