endl fixes

tests/test_endl.py

@@ -19,26 +19,12 @@
 else:
     from StringIO import StringIO
 
-if sys.version_info[0] > 2:
-    import urllib.request as urllib
-else:
-    import urllib
 
+from utils import download_file
 
 def test_loadfile():
-    if not os.path.isfile('epdl97_eedl_Pb'):
-        urllib.urlretrieve(
-                'https://www-nds.iaea.org/epdl97/data/endl/eedl/za082000',
-                'epdl97_eedl_Pb'
-                )
-    with open('epdl97_eedl_Pb', 'rb') as f:
-        obs_hash = md5(f.read()).hexdigest()
-    exp_hash = '502105669e0c0ad917301d219c649aaf'
-    assert_equal(
-            obs_hash, exp_hash,
-            msg='epdl97_eedl_Pb hash check failed; please try redownloading'
-            ' the epdl97_eedl_Pb data file.'
-            )
+    download_file('https://www-nds.iaea.org/epdl97/data/endl/eedl/za082000',
+                  'epdl97_eedl_Pb', '502105669e0c0ad917301d219c649aaf')
     testlib = Library('epdl97_eedl_Pb')
 
     # test the nuclides

tests/utils.py

@@ -14,8 +14,11 @@ def download_file(url, localfile, md5_hash):
             html = f.read()
     else:
         req = urllib.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
-        with urllib.urlopen(req, timeout=30.0) as f:
+        f = urllib.urlopen(req, timeout=30.0)
+        try:
             html = f.read()
+        finally:
+            f.close()
         with open(localfile, 'wb') as f:
             f.write(html)
     obs_hash = md5(html).hexdigest()