Fix blessclient for python3.7

Author: asottile

.gitignore

@@ -1,10 +1,11 @@
 *.pyc
-.coverage
-.cache
 .DS_Store
-coverage.xml
-venv/
-blessclient.run
+/.coverage
+/.pytest_cache
+/.tox
+blessclient.cfg
 blessclient.egg-info/
+blessclient.run
 build/
-blessclient.cfg
+coverage.xml
+venv/

.travis.yml

@@ -6,6 +6,16 @@ matrix:
             python: 3.6
         -   env: TOXENV=py27
             python: 2.7
+        # https://github.com/deadsnakes/travis-ci-python3.7-example
+        -   env: TOXENV=py37
+            sudo: required
+            dist: xenial
+            addons:
+              apt:
+                sources:
+                  - sourceline: 'deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main'
+                packages:
+                  - python3.7-dev
 install: pip install tox
 script: tox
 cache:

blessclient/bless_config.py

@@ -8,7 +8,7 @@ class BlessConfig(object):
         'user_session_length': '64800',
         'usebless_role_session_length': '3600',
         'update_sshagent': 'true',
-        'remote_user': None,
+        'remote_user': '',
         'ca_backend': 'bless',
     }
 

blessclient/client.py

@@ -756,9 +756,7 @@ def bless(region, nocache, showgui, hostname, bless_config):
 
     my_ip = userIP.getIP()
     ip_list = "{},{}".format(my_ip, bless_config.get_aws_config()['bastion_ips'])
-    remote_user = bless_config.get_aws_config()['remote_user']
-    if remote_user is None:
-        remote_user = username
+    remote_user = bless_config.get_aws_config()['remote_user'] or username
     payload = {
         'bastion_user': username,
         'bastion_user_ip': my_ip,