Clean up unused imports and names.

pavoljuhas · pavoljuhas · commit 7d62030081dc · 2016-01-29T14:05:15.000-05:00
diff --git a/diffpy/srreal/structureconverters.py b/diffpy/srreal/structureconverters.py
@@ -19,7 +19,6 @@
 StructureAdapter classes.
 """
 
-import numpy
 from diffpy.srreal.structureadapter import RegisterStructureAdapter
 from diffpy.srreal.srreal_ext import AtomicStructureAdapter
 from diffpy.srreal.srreal_ext import PeriodicStructureAdapter
diff --git a/diffpy/srreal/tests/__init__.py b/diffpy/srreal/tests/__init__.py
@@ -44,6 +44,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))
diff --git a/diffpy/srreal/tests/testatomradiitable.py b/diffpy/srreal/tests/testatomradiitable.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 from diffpy.srreal.tests.testutils import TestCasePeriodictableOptional
diff --git a/diffpy/srreal/tests/testattributes.py b/diffpy/srreal/tests/testattributes.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import weakref
 
diff --git a/diffpy/srreal/tests/testbondcalculator.py b/diffpy/srreal/tests/testbondcalculator.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 import numpy
diff --git a/diffpy/srreal/tests/testbvscalculator.py b/diffpy/srreal/tests/testbvscalculator.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
diff --git a/diffpy/srreal/tests/testdebyepdfcalculator.py b/diffpy/srreal/tests/testdebyepdfcalculator.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 import numpy
@@ -107,7 +106,6 @@ def test_partial_pdfs(self):
         dpdfc = self.dpdfc
         dpdfc.qmin = 1.0
         rutile = self.tio2rutile
-        atomtypes = [a.element for a in rutile]
         r0, g0 = dpdfc(rutile)
         # Ti-Ti
         dpdfc.maskAllPairs(False)
diff --git a/diffpy/srreal/tests/testoverlapcalculator.py b/diffpy/srreal/tests/testoverlapcalculator.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 import copy
diff --git a/diffpy/srreal/tests/testpairquantity.py b/diffpy/srreal/tests/testpairquantity.py
@@ -69,7 +69,6 @@ def test_ticker(self):
     def test_ticker_override(self):
         """check Python override of PairQuantity.ticker.
         """
-        from diffpy.srreal.eventticker import EventTicker
         pqd = PQDerived()
         self.assertEqual(0, pqd.tcnt)
         et0 = pqd.ticker()
diff --git a/diffpy/srreal/tests/testparallel.py b/diffpy/srreal/tests/testparallel.py
@@ -4,12 +4,10 @@
 """
 
 
-import os
 import unittest
 import multiprocessing
 import numpy
 from diffpy.srreal.tests.testutils import loadDiffPyStructure
-from diffpy.srreal.pdfcalculator import PDFCalculator
 from diffpy.srreal.parallel import createParallelCalculator
 
 ##############################################################################
diff --git a/diffpy/srreal/tests/testpdfbaseline.py b/diffpy/srreal/tests/testpdfbaseline.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
diff --git a/diffpy/srreal/tests/testpdfcalcobjcryst.py b/diffpy/srreal/tests/testpdfcalcobjcryst.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import re
 import unittest
 
diff --git a/diffpy/srreal/tests/testpdfcalculator.py b/diffpy/srreal/tests/testpdfcalculator.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
diff --git a/diffpy/srreal/tests/testpdfenvelope.py b/diffpy/srreal/tests/testpdfenvelope.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
diff --git a/diffpy/srreal/tests/testpeakprofile.py b/diffpy/srreal/tests/testpeakprofile.py
@@ -4,10 +4,8 @@
 """
 
 
-import os
 import unittest
 import cPickle
-import numpy
 
 from diffpy.srreal.peakprofile import PeakProfile, \
         GaussianProfile, CroppedGaussianProfile
@@ -101,7 +99,6 @@ def test_ticker(self):
     def test_ticker_override(self):
         """check method override for PeakProfile.ticker in a derived class.
         """
-        from diffpy.srreal.eventticker import EventTicker
         pkf = MySawTooth()
         self.assertEqual(0, pkf.tcnt)
         et0 = pkf.ticker()
@@ -163,7 +160,7 @@ def ticker(self):
 
     def __call__(self, x, fwhm):
         w = 1.0 * fwhm
-        rv = (1 - math.abs(x) / w) / (1.0 * w)
+        rv = (1 - abs(x) / w) / (1.0 * w)
         if rv < 0:  rv = 0
         return rv
 
diff --git a/diffpy/srreal/tests/testpeakwidthmodel.py b/diffpy/srreal/tests/testpeakwidthmodel.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
@@ -110,7 +109,6 @@ def test_ticker(self):
     def test_ticker_override(self):
         """check PeakWidthModel.ticker override in a Python-derived class.
         """
-        from diffpy.srreal.eventticker import EventTicker
         pwm = MyPWM()
         self.assertEqual(0, pwm.tcnt)
         et0 = pwm.ticker()
diff --git a/diffpy/srreal/tests/testscatteringfactortable.py b/diffpy/srreal/tests/testscatteringfactortable.py
@@ -4,7 +4,6 @@
 """
 
 
-import os
 import unittest
 import cPickle
 
@@ -61,7 +60,6 @@ def test_ticker(self):
     def test_ticker_override(self):
         """check Python override of ScatteringFactorTable.ticker.
         """
-        from diffpy.srreal.eventticker import EventTicker
         from diffpy.srreal.pdfcalculator import PDFCalculator
         lsft = LocalTable()
         self.assertEqual(0, lsft.tcnt)
diff --git a/diffpy/srreal/tests/teststructureadapter.py b/diffpy/srreal/tests/teststructureadapter.py
@@ -4,16 +4,17 @@
 """
 
 
-import os
 import unittest
 import cPickle
 import numpy
 from diffpy.Structure import Structure
 from diffpy.srreal.pdfcalculator import PDFCalculator
 from diffpy.srreal.tests.testutils import TestCaseObjCrystOptional
 from diffpy.srreal.tests.testutils import loadObjCrystCrystal
-from diffpy.srreal.tests.testutils import loadDiffPyStructure, datafile
-from diffpy.srreal.structureadapter import *
+from diffpy.srreal.tests.testutils import loadDiffPyStructure
+from diffpy.srreal.structureadapter import (
+        createStructureAdapter, nometa, nosymmetry, StructureAdapter,
+        AtomicStructureAdapter, Atom, PeriodicStructureAdapter)
 import diffpy.srreal.tests.testutils as testutils
 
 
diff --git a/diffpy/srreal/tests/testutils.py b/diffpy/srreal/tests/testutils.py
@@ -11,7 +11,6 @@
 
 
 import logging
-import os.path
 
 from diffpy.srreal.structureconverters import convertObjCrystCrystal
 
