From 9e07234baeb1542f37b1d2b9366d87e30de92f3c Mon Sep 17 00:00:00 2001
From: John Franey <johnfraney@gmail.com>
Date: Mon, 13 May 2019 17:30:29 -0400
Subject: [PATCH] Update Tox config and fix failing CI envs

Updates base Python version for Travis CI from 2.7 to 3.6 and fixes a
linting error.
---
 .travis.yml       | 4 ++--
 pelican/server.py | 2 +-
 tox.ini           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31b3ac8b..69034a97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: python
 python:
-  - "3.5"
+  - "3.6"
 env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
-  - TOX_ENV=py35
+  - TOX_ENV=py36
 matrix:
   include:
     - python: 3.6
diff --git a/pelican/server.py b/pelican/server.py
index 82ad70cd..841b8e88 100644
--- a/pelican/server.py
+++ b/pelican/server.py
@@ -138,6 +138,6 @@ if __name__ == '__main__':
                 args.port, args.server)
     try:
         httpd.serve_forever()
-    except KeyboardInterrupt as e:
+    except KeyboardInterrupt:
         logger.info("Shutting down server.")
         httpd.socket.close()
diff --git a/tox.ini b/tox.ini
index fc95ff91..15dbaee8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ commands =
     - coveralls
 
 [testenv:docs]
-basepython = python2.7
+basepython = python3.6
 deps =
     -rrequirements/docs.pip
 changedir = docs
@@ -34,7 +34,7 @@ application-import-names = pelican
 import-order-style = cryptography
 
 [testenv:flake8]
-basepython = python2.7
+basepython = python3.6
 deps =
     -rrequirements/style.pip
 commands =