Cleanup import and remove unused patch

jenshnielsen · jenshnielsen · commit deb3beab5e76 · 2014-11-08T21:15:46.000Z
diff --git a/doc/conf.py b/doc/conf.py
@@ -278,8 +278,12 @@
    1),
 ]
 
-from mock import MagicMock, patch
-import sys
+try:
+    from unittest.mock import MagicMock
+except:
+    from mock import MagicMock
+
+
 class MyWX(MagicMock):
     class Panel(object):
         pass
@@ -312,7 +316,6 @@ class QMainWindow(object):
 mockwx = MyWX()
 mockpyqt4 = MyPyQt4()
 mocksip = MagicMock()
-patch.dict('sys.modules', {'wxversion': mockwxversion, 'wx': mockwx})
 sys.modules['wxversion'] = mockwxversion
 sys.modules['wx'] = mockwx
 sys.modules['sip'] = mocksip
