Fixes piskvorky#1869 , Mmcorpus file object behaviour fixed

sj29-innovate · Feb 21, 2018 · 4bd295e · 4bd295e
1 parent d996114
commit 4bd295e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 31 deletions.
diff --git a/gensim/test/test_utils.py b/gensim/test/test_utils.py
@@ -86,46 +86,26 @@ def test_decode_entities(self):
         self.assertEqual(utils.decode_htmlentities(body), expected)
 
     def test_open_file_existent_file(self):
-        exc = False
-        try:
-            with utils.open_file(datapath('testcorpus.mm')):
-                pass
-        except Exception:
-            exc = True
-
-        self.assertFalse(exc)
+        number_of_lines_in_file = 30
+        with utils.open_file(datapath('testcorpus.mm')) as infile:
+            self.assertEqual(sum(1 for _ in infile), number_of_lines_in_file)
 
     def test_open_file_non_existent_file(self):
-        exc = False
-        try:
-            with utils.open_file(datapath('non_existent_file.txt')):
+        with self.assertRaises(Exception):
+            with utils.open_file('non_existent_file.txt'):
                 pass
-        except Exception:
-            exc = True
-
-        self.assertTrue(exc)
 
     def test_open_file_existent_file_object(self):
-        exc = False
+        number_of_lines_in_file = 30
         file_obj = open(datapath('testcorpus.mm'))
-        try:
-            with utils.open_file(file_obj):
-                pass
-        except Exception:
-            exc = True
-
-        self.assertFalse(exc)
+        with utils.open_file(file_obj) as infile:
+            self.assertEqual(sum(1 for _ in infile), number_of_lines_in_file)
 
     def test_open_file_non_existent_file_object(self):
-        exc = False
         file_obj = None
-        try:
+        with self.assertRaises(Exception):
             with utils.open_file(file_obj):
                 pass
-        except Exception:
-            exc = True
-
-        self.assertTrue(exc)
 
 
 class TestSampleDict(unittest.TestCase):

diff --git a/gensim/utils.py b/gensim/utils.py
@@ -162,12 +162,12 @@ def open_file(input):
     except Exception:
         # Handling any unhandled exceptions from the code nested in 'with' statement.
         exc = True
-        if not type(mgr).__exit__(mgr, *sys.exc_info()):
+        if not mgr.__exit__(*sys.exc_info()):
             raise
         # Try to introspect and silence errors.
     finally:
         if not exc and isinstance(input, string_types):
-            type(mgr).__exit__(mgr, None, None, None)
+            mgr.__exit__(None, None, None)
 
 
 def deaccent(text):