Merge branch 'master' into develop

abhishek1591 · Mar 2, 2017 · d73eaa1 · d73eaa1
2 parents 806bfec + 52af297
commit d73eaa1
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -12,15 +12,12 @@
 # serve to show the default.
 
 import sys, os
-try:
-  import mock
-  MOCK_MODULES = ['numpy', 'scipy', 'numba', 'pandas', 'matplotlib', 'scipy.sparse', 'scipy.sparse.linalg', 'numpy.core', 
+import mock
+MOCK_MODULES = ['numpy', 'scipy', 'numba', 'pandas', 'matplotlib', 'scipy.sparse', 'scipy.sparse.linalg', 'numpy.core', 
                   'numpy.core.numeric', 'scipy.io', 'numpy.linalg', 'matplotlib.collections', 'matplotlib.patches', 
                   'matplotlib.pyplot', 'matplotlib.colors', 'scipy.stats']
-  for mod_name in MOCK_MODULES:
-    sys.modules[mod_name] = mock.Mock()
-except:
-  pass
+for mod_name in MOCK_MODULES:
+  sys.modules[mod_name] = mock.Mock()
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the