MAINT: clean up issues reported by pyflakes.

Author: pavoljuhas

Diff for: src/pyobjcryst/__init__.py

@@ -87,3 +87,9 @@ def loadCrystal(filename):
     with open(filename) as fp:
         rv = CreateCrystalFromCIF(fp)
     return rv
+
+
+# silence the pyflakes syntax checker
+assert ObjCrystException is not None
+assert __version__ or True
+assert pyobjcryst.zscatterer

Diff for: src/pyobjcryst/atom.py

@@ -23,4 +23,6 @@
   will cause segmentation faults, even if it is printed.
 """
 
+__all__ = ["Atom"]
+
 from pyobjcryst._pyobjcryst import Atom

Diff for: src/pyobjcryst/crystal.py

@@ -29,6 +29,8 @@
   method accepts a python file rather than a CIF object.
 """
 
+__all__ = ["Crystal", "BumpMergePar", "CreateCrystalFromCIF"]
+
 from pyobjcryst._pyobjcryst import Crystal
 from pyobjcryst._pyobjcryst import BumpMergePar
 from pyobjcryst._pyobjcryst import CreateCrystalFromCIF

Diff for: src/pyobjcryst/diffractiondatasinglecrystal.py

@@ -19,7 +19,8 @@
 
 Changes from ObjCryst::DiffractionDataSingleCrystal::
         In development !
-
 """
 
+__all__ = ["DiffractionDataSingleCrystal"]
+
 from pyobjcryst._pyobjcryst import DiffractionDataSingleCrystal

Diff for: src/pyobjcryst/general.py

@@ -16,8 +16,9 @@
 """Python wrapping of things from General.h.
 
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
-
 """
 
+__all__ = ["RadiationType", "ObjCrystException"]
+
 from pyobjcryst._pyobjcryst import RadiationType
 from pyobjcryst._pyobjcryst import ObjCrystException

Diff for: src/pyobjcryst/io.py

@@ -19,7 +19,8 @@
 
 Changes from ObjCryst::XMLCrystTag
 - The istream constructor of XMLCrystTag is not wrapped.
-
 """
 
+__all__ = ["XMLCrystTag"]
+
 from pyobjcryst._pyobjcryst import XMLCrystTag

Diff for: src/pyobjcryst/molecule.py

@@ -82,6 +82,12 @@
   methods.
 """
 
+__all__ = ["Molecule", "GetBondLength", "GetBondAngle",
+           "GetDihedralAngle", "MolAtom", "MolBond",
+           "MolBondAngle", "MolDihedralAngle", "Quaternion",
+           "RigidGroup", "StretchMode", "StretchModeBondLength",
+           "StretchModeBondAngle", "StretchModeTorsion", "StretchModeTwist"]
+
 # TODO - MolRing
 
 from pyobjcryst._pyobjcryst import Molecule

Diff for: src/pyobjcryst/polyhedron.py

@@ -16,9 +16,12 @@
 """Python wrapping of Polyhedron.h
 
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
-
 """
 
+__all__ = ["MakeTetrahedron", "MakeOctahedron", "MakeSquarePlane",
+           "MakeCube", "MakeAntiPrismTetragonal", "MakePrismTrigonal",
+           "MakeIcosahedron", "MakeTriangle"]
+
 from pyobjcryst._pyobjcryst import MakeTetrahedron
 from pyobjcryst._pyobjcryst import MakeOctahedron
 from pyobjcryst._pyobjcryst import MakeSquarePlane

Diff for: src/pyobjcryst/powderpattern.py

@@ -16,9 +16,12 @@
 
 Changes from ObjCryst::PowderPattern::
         In development !
-
 """
 
+__all__ = ["PowderPattern", "CreatePowderPatternFromCIF",
+           "PowderPatternBackground", "PowderPatternComponent",
+           "PowderPatternDiffraction", "ReflectionProfileType"]
+
 from pyobjcryst._pyobjcryst import PowderPattern
 from pyobjcryst._pyobjcryst import CreatePowderPatternFromCIF
 from pyobjcryst._pyobjcryst import PowderPatternBackground

Diff for: src/pyobjcryst/refinableobj.py

@@ -64,6 +64,11 @@
 - XML input/output are not exposed.
 """
 
+__all__ = ["RefinableObjClock", "RefinableObj", "RefObjOpt",
+           "RefinableObjRegistry", "RefParType", "RefParDerivStepModel",
+           "RefinablePar", "Restraint", "ScattererRegistry",
+           "ScatteringPowerRegistry", "ZAtomRegistry"]
+
 from pyobjcryst._pyobjcryst import RefinableObjClock
 from pyobjcryst._pyobjcryst import RefinableObj
 from pyobjcryst._pyobjcryst import RefObjOpt

Diff for: src/pyobjcryst/reflectionprofile.py

@@ -16,7 +16,8 @@
 
 Changes from ObjCryst::ReflectionProfile::
         In development !
-
 """
 
+__all__ = ["ReflectionProfile"]
+
 from pyobjcryst._pyobjcryst import ReflectionProfile

Diff for: src/pyobjcryst/scatterer.py

@@ -29,4 +29,6 @@
 - Methods related to visualization are not exposed.
 """
 
+__all__ = ["Scatterer"]
+
 from pyobjcryst._pyobjcryst import Scatterer

Diff for: src/pyobjcryst/scatteringdata.py

@@ -18,4 +18,6 @@
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
 """
 
+__all__ = ["ScatteringData"]
+
 from pyobjcryst._pyobjcryst import ScatteringData

Diff for: src/pyobjcryst/scatteringpower.py

@@ -22,9 +22,11 @@
 
 Changes from ObjCryst::ScatteringComponentList
 - Wrapped as a to-python converter only (no constructor)
-
 """
 
+__all__ = ["ScatteringPower", "ScatteringComponent",
+           "ScatteringPowerAtom", "ScatteringComponentList"]
+
 from pyobjcryst._pyobjcryst import ScatteringPower
 from pyobjcryst._pyobjcryst import ScatteringComponent
 from pyobjcryst._pyobjcryst import ScatteringPowerAtom

Diff for: src/pyobjcryst/scatteringpowersphere.py

@@ -16,7 +16,8 @@
 """Python wrapping of ScatteringPowerSphere.h
 
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
-
 """
 
+__all__ = ["ScatteringPowerSphere"]
+
 from pyobjcryst._pyobjcryst import ScatteringPowerSphere

Diff for: src/pyobjcryst/spacegroup.py

@@ -16,8 +16,9 @@
 """Python wrapping of SpaceGroup.h.
 
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
-
 """
 
+__all__ = ["SpaceGroup", "AsymmetricUnit"]
+
 from pyobjcryst._pyobjcryst import SpaceGroup
 from pyobjcryst._pyobjcryst import AsymmetricUnit

Diff for: src/pyobjcryst/tests/pyobjcrysttest.py

@@ -66,7 +66,7 @@ def testCrystalScope():
 def testMultiAdd():
     """Test exception for multi-crystal additions."""
     sp, atom = makeScatterer()
-    c = makeCrystal(sp, atom)
+    makeCrystal(sp, atom)
 
     # Force this exception
     try:

Diff for: src/pyobjcryst/tests/testcrystal.py

@@ -17,8 +17,8 @@
 
 import unittest
 
-from pyobjcryst.tests.pyobjcrysttestutils import *
-
+from pyobjcryst.tests.pyobjcrysttestutils import (
+    makeScatterer, makeCrystal, getScatterer, makeScattererAnisotropic)
 from pyobjcryst.atom import Atom
 
 
@@ -37,7 +37,6 @@ def testCrystalScope(self):
 
     def testScattererScope(self):
         """Test when atoms go out of scope before crystal."""
-        c = makeCrystal(*makeScatterer())
         sp2 = getScatterer()
         self.assertEqual("Ni", sp2.GetName())
         return

Diff for: src/pyobjcryst/tests/testmolecule.py

@@ -17,11 +17,14 @@
 
 import unittest
 
-from pyobjcryst.molecule import *
 from pyobjcryst import ObjCrystException
+from pyobjcryst.molecule import (
+    GetBondLength, StretchModeBondLength,
+    GetBondAngle, StretchModeBondAngle,
+    GetDihedralAngle, StretchModeTorsion)
 from pyobjcryst.refinableobj import RefParType, RefinablePar
+from pyobjcryst.tests.pyobjcrysttestutils import makeC60, makeMnO6
 
-from pyobjcryst.tests.pyobjcrysttestutils import *
 from numpy import pi
 
 numplaces = 6
@@ -81,7 +84,6 @@ def testAtoms(self):
 
         This tests AddAtom by association.
         This tests GetAtom.
-
         """
         self.assertEqual(60, self.m.GetNbAtoms())
         for i in range(60):
@@ -90,7 +92,6 @@ def testAtoms(self):
 
         a = self.m.GetAtom(0)
         x = a.X
-        sp = a.GetScatteringPower()
 
         self.assertEqual(60, self.m.GetNbAtoms())
 

Diff for: src/pyobjcryst/tests/testrefinableobj.py

@@ -15,7 +15,8 @@
 
 """Tests for refinableobj module."""
 
-from pyobjcryst.refinableobj import *
+from pyobjcryst.refinableobj import RefinableObjClock, RefParType, Restraint
+from pyobjcryst.refinableobj import RefinablePar, RefinableObj
 from pyobjcryst import ObjCrystException
 
 import unittest

Diff for: src/pyobjcryst/unitcell.py

@@ -16,7 +16,8 @@
 """Python wrapping of UnitCell.h
 
 See the online ObjCryst++ documentation (http://vincefn.net/ObjCryst/).
-
 """
 
+__all__ = ["UnitCell"]
+
 from pyobjcryst._pyobjcryst import UnitCell

Diff for: src/pyobjcryst/zscatterer.py

@@ -22,9 +22,11 @@
 
 Changes from ObjCryst++
 - XMLOutput and Input are not wrapped.
-
 """
 
+__all__ = ["ZScatterer", "ZAtom", "ZPolyhedron",
+           "RegularPolyhedraType", "GlobalScatteringPower"]
+
 from pyobjcryst._pyobjcryst import ZScatterer
 from pyobjcryst._pyobjcryst import ZAtom
 from pyobjcryst._pyobjcryst import ZPolyhedron