From 00e13a12b667e229e9f4c9c70564608d6fc41ee3 Mon Sep 17 00:00:00 2001
From: Alexander Mancevice <amancevice@cargometrics.com>
Date: Sun, 20 Aug 2017 10:51:09 -0400
Subject: [PATCH] Travis/Tox fixes

---
 .travis.yml           | 13 ++++++++++++-
 influxalchemy/meta.py | 19 +++++++------------
 tox.ini               |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7540ff4..e7ab98a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 - '3.3'
 - '3.4'
 - '3.5'
+- '3.6'
 install: pip install . codecov mock pytest pytest-cov pylint
 script:
 - py.test --cov influxalchemy
@@ -14,7 +15,17 @@ deploy:
   provider: pypi
   user: amancevice
   password:
-    secure: KcT5EOQSnhmfs49RSA7Lfa+2O4IsZcuYyMQBVUDxz2eQIXHKP6WWTmAjVwFYhnlnBUoTRINieAhCElQraTdm55AAy9z4GwN+aXBLvnvnVZseLwCz6p25snYR9W47RykaLmvgbBvy20pvKBAWGvT/9KfD2L4tL5vQrVluuLbwBwCqK89KAPBc9wmaAeIQfAWb7ZlOAb3ts+k9FfUfpqjxUo5b1wWPOAvCcfmu/5qYNcEuowzqImQPzAX5sRZgXnp2/W9SRSMjt/DpxfG2DdGgYo0Vpm2WfZ4lvi9RzqD4mU6PtaO/R0DexquN1HxcfEUmVxvgpVqCPMlwf//H0GEXk8FfxK8b/bKIiBCzW3CP6chceK+3gvggCZKpQWHa8/1oeq0kk8UpVMWFutCaj7/T3rPE6F9earrPkMkPnX/pXRljz5E90mBryblYPW6cj4u32OeH1GpOjUU1eJHMsgtQ9L0XsqC5kQ4wzspxjdUR4TLdilxD1YLNIQkHnnXtb1d5CdMTLPiTPoM1LYpnF/IDYGFqzDdC4SNpdocMjWW0rWsJ5p+4FGswBOi9HKpLbBC8Vy8NIyV5fUji+N3+CJ38B8budcltXql6yjld4v6yLDEMu7fVwEsjI+vDo0+VAkX9jEU7oYxgCgkwySjUXPWwdcwXikqX/PAI/rjWVlMbb/I=
+    secure: >
+      KcT5EOQSnhmfs49RSA7Lfa+2O4IsZcuYyMQBVUDxz2eQIXHKP6WWTmAjVwFYhnlnBUoTRINie
+      AhCElQraTdm55AAy9z4GwN+aXBLvnvnVZseLwCz6p25snYR9W47RykaLmvgbBvy20pvKBAWGv
+      T/9KfD2L4tL5vQrVluuLbwBwCqK89KAPBc9wmaAeIQfAWb7ZlOAb3ts+k9FfUfpqjxUo5b1wW
+      POAvCcfmu/5qYNcEuowzqImQPzAX5sRZgXnp2/W9SRSMjt/DpxfG2DdGgYo0Vpm2WfZ4lvi9R
+      zqD4mU6PtaO/R0DexquN1HxcfEUmVxvgpVqCPMlwf//H0GEXk8FfxK8b/bKIiBCzW3CP6chce
+      K+3gvggCZKpQWHa8/1oeq0kk8UpVMWFutCaj7/T3rPE6F9earrPkMkPnX/pXRljz5E90mBryb
+      lYPW6cj4u32OeH1GpOjUU1eJHMsgtQ9L0XsqC5kQ4wzspxjdUR4TLdilxD1YLNIQkHnnXtb1d
+      5CdMTLPiTPoM1LYpnF/IDYGFqzDdC4SNpdocMjWW0rWsJ5p+4FGswBOi9HKpLbBC8Vy8NIyV5
+      fUji+N3+CJ38B8budcltXql6yjld4v6yLDEMu7fVwEsjI+vDo0+VAkX9jEU7oYxgCgkwySjUX
+      PWwdcwXikqX/PAI/rjWVlMbb/I=
   on:
     tags: true
     repo: amancevice/influxalchemy
diff --git a/influxalchemy/meta.py b/influxalchemy/meta.py
index 3bd409d..eea3643 100644
--- a/influxalchemy/meta.py
+++ b/influxalchemy/meta.py
@@ -1,19 +1,15 @@
 """ InfluxDB Meta Measurement. """
 
-import sys
 from datetime import date
 
 from . import operations
 
-if sys.version_info.major >= 3:
-    # pylint: disable=no-name-in-module
+try:
     from datetime import timezone
-    # pylint: disable=invalid-name
-    utc = timezone.utc
-else:
+    UTC = timezone.utc
+except ImportError:
     import pytz
-    # pylint: disable=invalid-name,redefined-variable-type
-    utc = pytz.utc
+    UTC = pytz.utc
 
 
 def make_tz_aware(datetime_obj):
@@ -26,7 +22,7 @@ def make_tz_aware(datetime_obj):
     if datetime_obj.tzinfo:
         return datetime_obj
     # With naive datetime object, assume it is UTC
-    return datetime_obj.replace(tzinfo=utc)
+    return datetime_obj.replace(tzinfo=UTC)
 
 
 class MetaMeasurement(type):
@@ -41,8 +37,7 @@ def __getattribute__(cls, name):
         except AttributeError:
             if name == "time":
                 return Time(name, cls)
-            else:
-                return Tag(name, cls)
+            return Tag(name, cls)
 
     def __str__(cls):
         return cls.__measurement__
@@ -56,7 +51,7 @@ def __ne__(cls, other):
     def __or__(cls, other):
         left = str(cls).strip("/")
         name = "_".join(left.split("|") + [str(other)])
-        bases = cls,
+        bases = (cls,)
         measurement = "/%s|%s/" % (str(cls).strip("/"), other)
         return type(name, bases, {"__measurement__": measurement})
 
diff --git a/tox.ini b/tox.ini
index 3670bdd..2de2dbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35
+envlist = py27, py36
 
 [testenv]
 deps=