From 4b2e7f524b3af5d22037595f4c003ad0914eab9f Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Jul 16 2018 14:06:16 +0000
Subject: pagure-ev: Use Trololio instead of Trollius directly


Trololio is a shim module that provides a Trollius-like
interface to use Trollius or asyncio, depending on what is available.

This will allow us to run pagure-ev on Python 3.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>

Merges https://pagure.io/pagure/pull-request/3396

---

diff --git a/pagure-ev/pagure_stream_server.py b/pagure-ev/pagure_stream_server.py
index 9077d6e..c911831 100644
--- a/pagure-ev/pagure_stream_server.py
+++ b/pagure-ev/pagure_stream_server.py
@@ -26,7 +26,7 @@ import os
 
 
 import redis
-import trollius
+from trololio import asyncio as trololio
 
 from six.moves.urllib.parse import urlparse
 
@@ -179,12 +179,12 @@ def get_obj_from_path(path):
     return getfunc(repo, objid)
 
 
-@trollius.coroutine
+@trololio.coroutine
 def handle_client(client_reader, client_writer):
     data = None
     while True:
         # give client a chance to respond, timeout after 10 seconds
-        line = yield trollius.From(trollius.wait_for(
+        line = yield trololio.From(trololio.wait_for(
             client_reader.readline(),
             timeout=10.0))
         if not line.decode().strip():
@@ -245,16 +245,16 @@ def handle_client(client_reader, client_writer):
                     client_writer.write(('event: ping\n\n').encode())
                     oncall = 0
                 oncall += 1
-                yield trollius.From(client_writer.drain())
-                yield trollius.From(trollius.sleep(1))
+                yield trololio.From(client_writer.drain())
+                yield trololio.From(trololio.sleep(1))
             else:
                 log.info("Sending %s", msg['data'])
                 client_writer.write(('data: %s\n\n' % msg['data']).encode())
-                yield trollius.From(client_writer.drain())
+                yield trololio.From(client_writer.drain())
 
     except OSError:
         log.info("Client closed connection")
-    except trollius.ConnectionResetError as err:
+    except trololio.ConnectionResetError as err:
         log.exception("ERROR: ConnectionResetError in handle_client")
     except Exception as err:
         log.exception("ERROR: Exception in handle_client")
@@ -266,7 +266,7 @@ def handle_client(client_reader, client_writer):
         client_writer.close()
 
 
-@trollius.coroutine
+@trololio.coroutine
 def stats(client_reader, client_writer):
 
     try:
@@ -276,9 +276,9 @@ def stats(client_reader, client_writer):
             "Cache: nocache\n\n"
         ).encode())
         client_writer.write(('data: %s\n\n' % SERVER.active_count).encode())
-        yield trollius.From(client_writer.drain())
+        yield trololio.From(client_writer.drain())
 
-    except trollius.ConnectionResetError as err:
+    except trololio.ConnectionResetError as err:
         log.info(err)
     finally:
         client_writer.close()
@@ -290,8 +290,8 @@ def main():
     _get_session()
 
     try:
-        loop = trollius.get_event_loop()
-        coro = trollius.start_server(
+        loop = trololio.get_event_loop()
+        coro = trololio.start_server(
             handle_client,
             host=None,
             port=pagure.config.config['EVENTSOURCE_PORT'],
@@ -300,7 +300,7 @@ def main():
         log.info(
             'Serving server at {}'.format(SERVER.sockets[0].getsockname()))
         if pagure.config.config.get('EV_STATS_PORT'):
-            stats_coro = trollius.start_server(
+            stats_coro = trololio.start_server(
                 stats,
                 host=None,
                 port=pagure.config.config.get('EV_STATS_PORT'),
@@ -311,7 +311,7 @@ def main():
         loop.run_forever()
     except KeyboardInterrupt:
         pass
-    except trollius.ConnectionResetError as err:
+    except trololio.ConnectionResetError as err:
         log.exception("ERROR: ConnectionResetError in main")
     except Exception:
         log.exception("ERROR: Exception in main")
diff --git a/requirements-ci.txt b/requirements-ci.txt
index 26f0435..edc7d3b 100644
--- a/requirements-ci.txt
+++ b/requirements-ci.txt
@@ -1,3 +1,4 @@
 cryptography
 python-jenkins
 trollius
+trololio
diff --git a/requirements-ev.txt b/requirements-ev.txt
index 7b0645d..867a09f 100644
--- a/requirements-ev.txt
+++ b/requirements-ev.txt
@@ -1 +1,2 @@
 trollius
+trololio
diff --git a/requirements-webhook.txt b/requirements-webhook.txt
index 7b0645d..867a09f 100644
--- a/requirements-webhook.txt
+++ b/requirements-webhook.txt
@@ -1 +1,2 @@
 trollius
+trololio
diff --git a/tests_requirements.txt b/tests_requirements.txt
index 6aa8702..fa39fbb 100644
--- a/tests_requirements.txt
+++ b/tests_requirements.txt
@@ -8,6 +8,7 @@ nose>=0.10.4
 nosexcover
 python-fedora
 trollius
+trololio
 fedmsg
 
 # Seems that mock doesn't list this one