Skip to content

Commit b9dfb41

Browse files
committed
Clean up redundant imports reported by pyflakes.
1 parent 603997c commit b9dfb41

18 files changed

+13
-24
lines changed

diffpy/srfit/fitbase/fitresults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def update(self):
150150

151151
# Calcualte the restraints penalty
152152
w = self.chi2 / len(res)
153-
self.penalty = sum([res.penalty(w) for res in recipe._restraintlist])
153+
self.penalty = sum([r.penalty(w) for r in recipe._restraintlist])
154154

155155
return
156156

diffpy/srfit/sas/sasparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"""
2020
__all__ = ["SASParser"]
2121

22-
import numpy
2322

2423
from diffpy.srfit.exceptions import ParseError
2524
from diffpy.srfit.fitbase.profileparser import ProfileParser
2625
from diffpy.srfit.sas.sasimport import sasimport
2726

27+
2828
class SASParser(ProfileParser):
2929
"""Class for parsing a sas profile.
3030

diffpy/srfit/structure/cctbxparset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
2929
"""
3030

31-
from diffpy.srfit.fitbase.parameter import Parameter, ParameterAdapter
31+
from diffpy.srfit.fitbase.parameter import ParameterAdapter
3232
from diffpy.srfit.fitbase.parameterset import ParameterSet
3333
from diffpy.srfit.structure.basestructureparset import BaseStructureParSet
3434

diffpy/srfit/structure/diffpyparset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
__all__ = ["DiffpyStructureParSet"]
3232

33-
from diffpy.srfit.fitbase.parameter import Parameter, ParameterProxy
33+
from diffpy.srfit.fitbase.parameter import ParameterProxy
3434
from diffpy.srfit.fitbase.parameter import ParameterAdapter
3535
from diffpy.srfit.fitbase.parameterset import ParameterSet
3636
from diffpy.srfit.structure.srrealparset import SrRealParSet

diffpy/srfit/structure/objcrystparset.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
from diffpy.srfit.fitbase.parameter import Parameter, ParameterAdapter
4949
from diffpy.srfit.fitbase.parameter import ParameterProxy
5050
from diffpy.srfit.fitbase.parameterset import ParameterSet
51-
from diffpy.srfit.fitbase.restraint import Restraint
5251
from diffpy.srfit.structure.srrealparset import SrRealParSet
5352

5453
class ObjCrystScattererParSet(ParameterSet):

diffpy/srfit/structure/sgconstraints.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import numpy
1919

2020
from diffpy.srfit.fitbase.recipeorganizer import RecipeContainer
21-
from diffpy.srfit.fitbase.parameter import Parameter, ParameterProxy
21+
from diffpy.srfit.fitbase.parameter import ParameterProxy
2222

2323
__all__ = ["constrainAsSpaceGroup"]
2424

diffpy/srfit/tests/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def testsuite():
5656
'''.split()
5757
suite = unittest.TestSuite()
5858
loader = unittest.defaultTestLoader
59+
mobj = None
5960
for mname in modulenames:
6061
exec ('import %s as mobj' % mname)
6162
suite.addTests(loader.loadTestsFromModule(mobj))

diffpy/srfit/tests/speedtest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ def f(b1, b2, b3, b4, b5, b6, b7, b8):
387387

388388
def profileTest():
389389

390+
from diffpy.srfit.builder import EquationFactory
390391
factory = EquationFactory()
391392

392393
x = numpy.arange(0, 10, 0.001)

diffpy/srfit/tests/testbuilder.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import diffpy.srfit.equation.builder as builder
1818
import diffpy.srfit.equation.literals as literals
19-
import diffpy.srfit.equation.visitors as visitors
2019

2120
import unittest
2221

@@ -84,7 +83,6 @@ def testRegisterOperator(self):
8483

8584
def testSwapping(self):
8685

87-
import numpy
8886
def g1(v1, v2, v3, v4):
8987
return (v1 + v2) * (v3 + v4)
9088
def g2(v1):
@@ -144,7 +142,7 @@ def g2(v1):
144142

145143
def testParseEquation(self):
146144

147-
from numpy import exp, sin, divide, sqrt, array_equal, e
145+
from numpy import sin, divide, sqrt, array_equal, e
148146

149147
factory = builder.EquationFactory()
150148

diffpy/srfit/tests/testcontribution.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ def testResidual(self):
182182
self.assertTrue(fc._reseq._value is None)
183183
from numpy import sin
184184
xobs = arange(0, 10, 0.5)
185-
from numpy import sin
186185
yobs = 9*sin(xobs)
187186
profile.setObservedProfile(xobs, yobs)
188187
self.assertTrue(fc._eq._value is None)

0 commit comments

Comments
 (0)