From: <bao...@us...> - 2006-05-21 14:40:51
|
Revision: 135 Author: baoilleach Date: 2006-05-21 07:40:37 -0700 (Sun, 21 May 2006) ViewCVS: http://svn.sourceforge.net/cclib/?rev=135&view=rev Log Message: ----------- I've put the magic back into __init__.py. There was no circular import problem this time. Some of the rearrangements I made first time 'round must have had an effect. Modified Paths: -------------- trunk/src/cclib/parser/__init__.py trunk/test/testGeoOpt.py trunk/test/testSP.py trunk/test/testSPun.py trunk/test/testall.py Modified: trunk/src/cclib/parser/__init__.py =================================================================== --- trunk/src/cclib/parser/__init__.py 2006-05-20 01:08:57 UTC (rev 134) +++ trunk/src/cclib/parser/__init__.py 2006-05-21 14:40:37 UTC (rev 135) @@ -0,0 +1,4 @@ +from gaussianparser import Gaussian +from gamessparser import GAMESS +from adfparser import ADF +from jaguarparser import Jaguar Modified: trunk/test/testGeoOpt.py =================================================================== --- trunk/test/testGeoOpt.py 2006-05-20 01:08:57 UTC (rev 134) +++ trunk/test/testGeoOpt.py 2006-05-21 14:40:37 UTC (rev 135) @@ -1,12 +1,8 @@ import os, unittest from Numeric import array from testall import getfile -from cclib.parser.adfparser import ADF -from cclib.parser.gamessparser import GAMESS -from cclib.parser.gaussianparser import Gaussian -from cclib.parser.jaguarparser import Jaguar +from cclib.parser import ADF, GAMESS, Gaussian, Jaguar - class GenericGeoOptTest(unittest.TestCase): def testhomos(self): """Is the index of the homo equal to 34?""" Modified: trunk/test/testSP.py =================================================================== --- trunk/test/testSP.py 2006-05-20 01:08:57 UTC (rev 134) +++ trunk/test/testSP.py 2006-05-21 14:40:37 UTC (rev 135) @@ -1,10 +1,7 @@ import os, unittest from Numeric import array from testall import getfile -from cclib.parser.adfparser import ADF -from cclib.parser.gamessparser import GAMESS -from cclib.parser.gaussianparser import Gaussian -from cclib.parser.jaguarparser import Jaguar +from cclib.parser import ADF, GAMESS, Gaussian, Jaguar class GenericSPTest(unittest.TestCase): """Restricted single point calculations with MO coeffs and overlap info.""" Modified: trunk/test/testSPun.py =================================================================== --- trunk/test/testSPun.py 2006-05-20 01:08:57 UTC (rev 134) +++ trunk/test/testSPun.py 2006-05-21 14:40:37 UTC (rev 135) @@ -1,10 +1,7 @@ import os, unittest from Numeric import array from testall import getfile -from cclib.parser.adfparser import ADF -from cclib.parser.gamessparser import GAMESS -from cclib.parser.gaussianparser import Gaussian -from cclib.parser.jaguarparser import Jaguar +from cclib.parser import ADF, GAMESS, Gaussian, Jaguar class GenericSPunTest(unittest.TestCase): """Restricted single point calculations with MO coeffs and overlap info.""" Modified: trunk/test/testall.py =================================================================== --- trunk/test/testall.py 2006-05-20 01:08:57 UTC (rev 134) +++ trunk/test/testall.py 2006-05-21 14:40:37 UTC (rev 135) @@ -1,9 +1,6 @@ import unittest import os -from cclib.parser.adfparser import ADF -from cclib.parser.gamessparser import GAMESS -from cclib.parser.gaussianparser import Gaussian -from cclib.parser.jaguarparser import Jaguar +from cclib.parser import ADF, GAMESS, Gaussian, Jaguar def getfile(parser,*location): """Returns a parsed logfile.""" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |