re-enable mock, add wintypes to it

#48
maphew · Jun 21, 2015 · 88d7f03 · 88d7f03
1 parent 5a90771
commit 88d7f03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -18,11 +18,9 @@
 
 # https://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
 try:
-    py3 import
-    from unittest.mock import MagicMock
+    from unittest.mock import MagicMock #py3 import
 except ImportError:
-    py27 import
-    from mock import Mock as MagicMock
+    from mock import Mock as MagicMock  #py27 import
 
 class Mock(MagicMock):
     @classmethod

diff --git a/docs/source/index.rst.leo b/docs/source/index.rst.leo
@@ -12,7 +12,7 @@
 <vnodes>
 <v t="maphew.20150613204824.4"><vh>@persistence</vh>
 <v t="maphew.20150613204824.5" a="E"><vh>@data:@auto conf.py</vh>
-<v t="maphew.20150620221605.2"><vh>@gnxs</vh></v>
+<v t="maphew.20150620221605.4"><vh>@gnxs</vh></v>
 </v>
 </v>
 <v t="maphew.20150601230033.5" a="E"><vh>Apt - Read The Docs</vh>
@@ -27,7 +27,7 @@
 <t tx="maphew.20150613204824.4"></t>
 <t tx="maphew.20150613204824.5">gnx: maphew.20150613204824.2
 </t>
-<t tx="maphew.20150620221605.2">gnx: maphew.20150613204824.3
+<t tx="maphew.20150620221605.4">gnx: maphew.20150613204824.3
 unl: conf declarations
 </t>
 </tnodes>