Merge branch 'master' into multi-screenlock

* master:
  virtualenv already installed i think
  use pyenv for py3k
  Switch to pywin32

Author: ianwremmel

.travis.yml

@@ -3,16 +3,13 @@ matrix:
     - language: generic
       os: osx
       before_install:
-        - curl https://bootstrap.pypa.io/get-pip.py | sudo python
-        - sudo pip install virtualenv
         - virtualenv venv
         - . ./venv/bin/activate
     - language: generic
       os: osx
       before_install:
-        - brew update
-        - brew install python3
-        - virtualenv env -p python3
+        - pyenv install 3.6.3
+        - virtualenv env -p $(pyenv root)/versions/3.6.3/bin/python
         - source env/bin/activate
     - language: python
       python: 2.7

setup.py

@@ -6,7 +6,7 @@
 
 deps = ['requests', 'ruamel.yaml', 'appdirs']
 extra_deps = {
-    ':sys_platform == "win32"': ['pypiwin32==219'],
+    ':sys_platform == "win32"': ['pywin32'],
     ':sys_platform == "darwin"': ['pyobjc-core', 'pyobjc'],
     'xmpp': [
         'sleekxmpp', 'dnspython' if version_info[0] < 3 else 'dnspython3'],