Tightened up assertions. All tests still pass on 2.x/3.x.

vsajip · Jan 2, 2017 · 9935e6f · 9935e6f
1 parent baf3dc1
commit 9935e6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/supervisor/http.py b/supervisor/http.py
@@ -371,7 +371,8 @@ def refill_buffer (self):
                         self.producer_fifo.pop()
                         self.close()
                     return
-                elif isinstance(p, str):
+                else:
+                    assert isinstance(p, bytes)
                     self.producer_fifo.pop()
                     self.ac_out_buffer += p
                     return

diff --git a/supervisor/medusa/asynchat_25.py b/supervisor/medusa/asynchat_25.py
@@ -196,10 +196,12 @@ def refill_buffer (self):
                         self.producer_fifo.pop()
                         self.close()
                     return
-                elif isinstance(p, str):
+                else:
+                    assert isinstance(p, bytes)
                     self.producer_fifo.pop()
                     self.ac_out_buffer += p
                     return
+
                 data = p.more()
                 if data:
                     self.ac_out_buffer = self.ac_out_buffer + data

diff --git a/supervisor/medusa/http_server.py b/supervisor/medusa/http_server.py
@@ -262,11 +262,9 @@ def found_terminator (self):
                     )
 
     def push (self, thing):
-        if type(thing) == type(''):
-            self.outgoing.append(producers.simple_producer(thing,
-              buffer_size=len(thing)))
-        else:
-            self.outgoing.append(thing)
+        assert isinstance(thing, bytes)
+        thing = producers.simple_producer(thing, buffer_size=len(thing))
+        self.outgoing.append(thing)
 
     def response (self, code=200):
         message = self.responses[code]