From 0951971783b3a20e4fa90b4235f04e5989566343 Mon Sep 17 00:00:00 2001
From: Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
Date: Fri, 6 Dec 2019 13:28:13 +0200
Subject: [PATCH] Replace urllib.request with requests

---
 ckanext/googleanalytics/plugin/__init__.py          | 13 +++++--------
 .../plugin/{paster_plugin.py => pylons_plugin.py}   |  0
 ckanext/googleanalytics/views.py                    |  1 -
 requirements.txt                                    |  1 +
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename ckanext/googleanalytics/plugin/{paster_plugin.py => pylons_plugin.py} (100%)

diff --git a/ckanext/googleanalytics/plugin/__init__.py b/ckanext/googleanalytics/plugin/__init__.py
index 29823f9..0811c89 100644
--- a/ckanext/googleanalytics/plugin/__init__.py
+++ b/ckanext/googleanalytics/plugin/__init__.py
@@ -6,22 +6,22 @@ from builtins import str
 from builtins import range
 import ast
 import logging
-import urllib.request, urllib.parse, urllib.error
 import ckanext.googleanalytics.commands as commands
 import paste.deploy.converters as converters
 import ckan.lib.helpers as h
 import ckan.plugins as p
 import ckan.plugins.toolkit as tk
-import urllib.request, urllib.error, urllib.parse
+import  urllib.parse
 from ckan.exceptions import CkanVersionException
 import threading
+import requests
 
 log = logging.getLogger(__name__)
 
 try:
     tk.requires_ckan_version("2.9")
 except CkanVersionException:
-    from ckanext.googleanalytics.plugin.paster_plugin import GAMixinPlugin
+    from ckanext.googleanalytics.plugin.pylons_plugin import GAMixinPlugin
 else:
     from ckanext.googleanalytics.plugin.flask_plugin import GAMixinPlugin
 
@@ -45,14 +45,11 @@ class AnalyticsPostThread(threading.Thread):
             data = urllib.parse.urlencode(data_dict)
             log.debug("Sending API event to Google Analytics: " + data)
             # send analytics
-            urllib.request.urlopen(
+            res = requests.post(
                 "http://www.google-analytics.com/collect",
                 data,
-                # timeout in seconds
-                # https://docs.python.org/2/library/urllib2.html#urllib2.urlopen
-                10,
+                timeout=10,
             )
-
             # signals to queue job is done
             self.queue.task_done()
 
diff --git a/ckanext/googleanalytics/plugin/paster_plugin.py b/ckanext/googleanalytics/plugin/pylons_plugin.py
similarity index 100%
rename from ckanext/googleanalytics/plugin/paster_plugin.py
rename to ckanext/googleanalytics/plugin/pylons_plugin.py
diff --git a/ckanext/googleanalytics/views.py b/ckanext/googleanalytics/views.py
index fc2a907..d90aca1 100644
--- a/ckanext/googleanalytics/views.py
+++ b/ckanext/googleanalytics/views.py
@@ -71,7 +71,6 @@ def _post_analytics(
 ):
 
     from ckanext.googleanalytics.plugin import GoogleAnalyticsPlugin
-
     if tk.config.get("googleanalytics.id"):
         data_dict = {
             "v": 1,
diff --git a/requirements.txt b/requirements.txt
index 1c479b4..10c859a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 gdata>=2.0.0
 google-api-python-client>=1.6.1, <1.7.0
 pyOpenSSL>=16.2.0
+future>=0.18.2