From d11e2efe453cfcc4e62509a67a0350a40aa1c253 Mon Sep 17 00:00:00 2001
From: Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
Date: Tue, 28 Jul 2020 23:14:15 +0300
Subject: [PATCH] remove future

---
 ckanext/googleanalytics/plugin/__init__.py      | 8 ++------
 ckanext/googleanalytics/plugin/flask_plugin.py  | 3 ---
 ckanext/googleanalytics/plugin/pylons_plugin.py | 3 ---
 requirements.txt                                | 1 -
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/ckanext/googleanalytics/plugin/__init__.py b/ckanext/googleanalytics/plugin/__init__.py
index 5dd66f4..44edb04 100644
--- a/ckanext/googleanalytics/plugin/__init__.py
+++ b/ckanext/googleanalytics/plugin/__init__.py
@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-from future import standard_library
-
-standard_library.install_aliases()
-
-import urllib.parse
+from six.moves.urllib.parse import urlencode
 import ast
 import logging
 import threading
@@ -48,7 +44,7 @@ class AnalyticsPostThread(threading.Thread):
             # grabs host from queue
             data_dict = self.queue.get()
 
-            data = urllib.parse.urlencode(data_dict)
+            data = urlencode(data_dict)
             log.debug("Sending API event to Google Analytics: " + data)
             # send analytics
             res = requests.post(
diff --git a/ckanext/googleanalytics/plugin/flask_plugin.py b/ckanext/googleanalytics/plugin/flask_plugin.py
index 74b4c51..f3653e6 100644
--- a/ckanext/googleanalytics/plugin/flask_plugin.py
+++ b/ckanext/googleanalytics/plugin/flask_plugin.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from future import standard_library
-
-standard_library.install_aliases()
 import queue
 
 import ckan.plugins as plugins
diff --git a/ckanext/googleanalytics/plugin/pylons_plugin.py b/ckanext/googleanalytics/plugin/pylons_plugin.py
index a3fac66..af3aa36 100644
--- a/ckanext/googleanalytics/plugin/pylons_plugin.py
+++ b/ckanext/googleanalytics/plugin/pylons_plugin.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from future import standard_library
-
-standard_library.install_aliases()
 import queue
 
 import hashlib
diff --git a/requirements.txt b/requirements.txt
index 10c859a..1c479b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
 gdata>=2.0.0
 google-api-python-client>=1.6.1, <1.7.0
 pyOpenSSL>=16.2.0
-future>=0.18.2