From 189ffbaa538474c137c3aee4fc7aadffe301a63e Mon Sep 17 00:00:00 2001
From: nocturn9x <hackhab@gmail.com>
Date: Thu, 19 Mar 2020 21:15:22 +0000
Subject: [PATCH] Added some fixes, still just partially working (join issue
 still there)

---
 giambio/.core.py.swp | Bin 0 -> 1024 bytes
 giambio/core.py      |  15 +++++----------
 test.py              |   6 ++++--
 3 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 giambio/.core.py.swp

diff --git a/giambio/.core.py.swp b/giambio/.core.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..27b96637a497ee8689c845315bae40ae1cecc086
GIT binary patch
literal 1024
zcmYc?$V<%2S1{HyVn6{4B^Vfr^7Bhj1aWY3@{<#DGV+TFDNfH!%uUM7*H6wbO4Tc<
R#9`W~@Ms8(h5)@n000GL4*viE

literal 0
HcmV?d00001

diff --git a/giambio/core.py b/giambio/core.py
index 2715da7..8c533a2 100644
--- a/giambio/core.py
+++ b/giambio/core.py
@@ -35,7 +35,7 @@ class Task:
         return self.coroutine.send(None)
 
     def __repr__(self):
-        return f"<giambio.core.Task({self.coroutine}, {self.status})"
+        return f"<giambio.core.Task({self.coroutine}, {self.status}, {self.joined})"
 
 class EventLoop:
 
@@ -48,7 +48,7 @@ class EventLoop:
         self.to_run = deque()  # Scheduled tasks
         self.paused = deque()  # Paused or sleeping tasks
         self.selector = DefaultSelector()  # Selector object to perform I/O multiplexing
-        self.running = None  # This will always point to the currently running coroutine object
+        self.running = None  # This will always point to the currently running coroutine (Task object)
         self.waitlist = defaultdict(list)  # Tasks that want to join
 
     @sync_only
@@ -75,16 +75,10 @@ class EventLoop:
                     if self.running.joined:
                         exceptions[self.running] = has_raised  # Errored? Save the exception
                     else:  # If the task is not joined, the exception would disappear, but not in giambio
-                        print("Traceback (most recent call last):")
-                        traceback.print_tb(has_raised.__traceback__)
-                        ename = type(has_raised).__name__
-                        if str(has_raised):
-                            print(f"{ename}: {has_raised}")
-                        else:
-                            print(has_raised)
                         raise GiambioError from has_raised
                     self.to_run.extend(self.waitlist.pop(self.running, ()))
 
+
     def spawn(self, coroutine: types.coroutine):
         """Schedules a task for execution, appending it to the call stack"""
 
@@ -104,7 +98,7 @@ class EventLoop:
         self.selector.register(sock, EVENT_READ, self.running)
 
     def want_write(self, sock: socket.socket):
-        """Handler for the 'want_read' event, performs the needed operations to write into the passed socket
+        """Handler for the 'want_write' event, performs the needed operations to write into the passed socket
         asynchronously"""
 
         self.selector.register(sock, EVENT_WRITE, self.running)
@@ -143,6 +137,7 @@ class AsyncSocket(object):
 
     def __init__(self, sock: socket.socket, loop: EventLoop):
         self.sock = sock
+        self.sock.setblocking(False)
         self.loop = loop
 
     async def receive(self, max_size: int):
diff --git a/test.py b/test.py
index fb2a5c1..f7d2bec 100644
--- a/test.py
+++ b/test.py
@@ -43,5 +43,7 @@ async def echo_server(sock: AsyncSocket, addr: tuple):
     logging.info(f"Connection from {addr} closed")
 
 
-loop.start(make_srv, ('', 1500))
-
+try:
+    loop.start(make_srv, ('', 1500))
+except giambio.exceptions.GiambioError as error:
+    print(f"Error: {error}")