fix windows tests, include improvements from 0.10.1

libmproxy/version.py

@@ -1,4 +1,5 @@
 IVERSION = (0, 11)
 VERSION = ".".join(str(i) for i in IVERSION)
+MINORVERSION = ".".join(str(i) for i in IVERSION[:1])
 NAME = "mitmproxy"
 NAMEVERSION = NAME + " " + VERSION

requirements.txt

@@ -6,7 +6,7 @@ Werkzeug>=0.8.3
 lxml>=3.2.1
 netlib>=0.10
 pathod>=0.9.2
-pyOpenSSL>=0.13
+pyOpenSSL>=0.14
 pyasn1>=0.1.7
 requests>=1.2.2
 urwid>=1.1.1

setup.py

@@ -99,7 +99,7 @@ setup(
             "Topic :: Software Development :: Testing"
         ],
         install_requires=[
-            "netlib>=%s"%version.VERSION,
+            "netlib>=%s"%version.MINORVERSION,
             "urwid>=1.1",
             "pyasn1>0.1.2",
             "pyopenssl>=0.14",

test/test_console_search.py

@@ -1,8 +1,10 @@
+import os
+from nose.plugins.skip import SkipTest
+if os.name == "nt":
+    raise SkipTest("Skipped on Windows.")
 
-import sys
-import libmproxy.console.contentview as cv
-from libmproxy import utils, flow, encoding
 import tutils
+import libmproxy.console.contentview as cv
 
 def test_search_highlights():
     # Default text in requests is content. We will search for nt once, and