From 35f28a322ab5c559496c336805e8fd26197ea3b2 Mon Sep 17 00:00:00 2001
From: Yash Shah <yashshah0127@gmail.com>
Date: Mon, 23 Jan 2017 10:17:38 -0800
Subject: [PATCH] Resolve Python 2 str/unicode discrepancy

---
 geomagio/Controller.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index ece81ed6..d176b10c 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -1,5 +1,6 @@
 """Controller class for geomag algorithms"""
 from __future__ import absolute_import, print_function
+from builtins import str as unicode
 
 import argparse
 import sys
@@ -475,7 +476,7 @@ def main(args):
     # TODO check for unused arguments.
 
     # make sure observatory is a tuple
-    if isinstance(args.observatory, (str, str)):
+    if isinstance(args.observatory, (str, unicode)):
         args.observatory = (args.observatory,)
 
     if args.observatory_foreach:
-- 
GitLab