Rename pyzmqtulip to aiozmq

Author: asvetlov

README.rst

@@ -9,23 +9,23 @@ Event loop
 To use tulip with zmq event loop you have to install new event loop::
 
    import tulip
-   import zmqtulip
+   import aiozmq
 
-   loop = zmqtulip.new_event_loop()
+   loop = aiozmq.new_event_loop()
    tulip.set_event_loop(loop)
 
 
 Usage
 -----
 
-Instead of using `zmq.Context` directly, use `zmqtulip.Context`.
+Instead of using `zmq.Context` directly, use `aiozmq.Context`.
 All `recvXXX` methods of Socket object are coroutines::
 
   # simple client
 
   import tulip
   import zmq
-  import zmqtulip
+  import aiozmq
 
   @tulip.coroutine
   def read_socket(sock):
@@ -35,10 +35,10 @@ All `recvXXX` methods of Socket object are coroutines::
           # do_some_work(msg)
 
   if __name__ == '__main__':
-      loop = zmqtulip.new_event_loop()
+      loop = aiozmq.new_event_loop()
       tulip.set_event_loop(loop)
 
-      ctx = zmqtulip.Context(loop=loop) # create a new context
+      ctx = aiozmq.Context(loop=loop) # create a new context
       sock = ctx.socket(zmq.PULL)
       sock.connect('ipc:///tmp/zmqtest')
 
@@ -59,4 +59,4 @@ Requirements
 License
 -------
 
-pyzmqtulip is offered under the BSD license.
+pyaiozmq is offered under the BSD license.

zmqtulip/__init__.py renamed to aiozmq/__init__.py

@@ -1,12 +1,12 @@
 import tulip
 import zmq
-import zmqtulip
+import aiozmq
 
-loop = zmqtulip.new_event_loop()
+loop = aiozmq.new_event_loop()
 tulip.set_event_loop(loop)
 
 # server
-ctx = zmqtulip.Context(loop=loop)
+ctx = aiozmq.Context(loop=loop)
 #sock1 = ctx.socket(zmq.PUSH)
 #sock1.bind('ipc:///tmp/zmqtest')
 
@@ -25,7 +25,7 @@ def send_data():
 
 
 # client
-ctx = zmqtulip.Context(loop=loop)  # create a new context to kick the wheels
+ctx = aiozmq.Context(loop=loop)  # create a new context to kick the wheels
 sock2 = ctx.socket(zmq.PULL)
 sock2.connect('ipc:///tmp/zmqtest')
 

zmqtulip/core.py renamed to aiozmq/core.py

@@ -5,7 +5,7 @@
 import email.message
 import os
 import sys
-import zmqtulip
+import aiozmq
 try:
     import ssl
 except ImportError:  # pragma: no cover
@@ -138,7 +138,7 @@ def main():
     else:
         sslcontext = None
 
-    loop = zmqtulip.new_event_loop()
+    loop = aiozmq.new_event_loop()
     tulip.set_event_loop(loop)
     f = loop.start_serving(
         lambda: HttpServer(debug=True, keep_alive=75), args.host, args.port,

zmqtulip/events.py renamed to aiozmq/events.py

@@ -3,7 +3,7 @@
 import argparse
 import signal
 import tulip
-import zmqtulip
+import aiozmq
 
 
 class EchoServer(tulip.Protocol):
@@ -99,7 +99,7 @@ def start_server(loop, host, port):
         print('Please specify --server or --client\n')
         ARGS.print_help()
     else:
-        loop = zmqtulip.new_event_loop()
+        loop = aiozmq.new_event_loop()
         loop.add_signal_handler(signal.SIGINT, loop.stop)
 
         tulip.set_event_loop(loop)

zmqtulip/interface.py renamed to aiozmq/interface.py

@@ -4,7 +4,7 @@
 import sys
 import signal
 import tulip
-import zmqtulip
+import aiozmq
 
 
 class MyServerUdpEchoProtocol:
@@ -84,7 +84,7 @@ def start_client(loop, addr):
         print('Please specify --server or --client\n')
         ARGS.print_help()
     else:
-        loop = zmqtulip.new_event_loop()
+        loop = aiozmq.new_event_loop()
         loop.add_signal_handler(signal.SIGINT, loop.stop)
 
         tulip.set_event_loop(loop)

zmqtulip/selector.py renamed to aiozmq/selector.py

@@ -6,7 +6,7 @@
 import socket
 import signal
 import time
-import zmqtulip
+import aiozmq
 import tulip
 import tulip.http
 from tulip.http import websocket
@@ -302,7 +302,7 @@ def main():
         args.host, port = args.host.split(':', 1)
         args.port = int(port)
 
-    tulip.set_event_loop(zmqtulip.new_event_loop())
+    tulip.set_event_loop(aiozmq.new_event_loop())
 
     superviser = Superviser(args)
     superviser.start()

examples/simple.py

@@ -3,5 +3,5 @@ zip_ok = false
 
 [nosetests]
 nocapture = 1
-cover-package = zmqtulip
+cover-package = aiozmq
 cover-erase = 1

examples/srv.py

@@ -14,17 +14,17 @@ def read(f):
 
 def read_version():
     regexp = re.compile(r"^__version__\W*=\W*'([\d.]+)'")
-    init_py = os.path.join(os.path.dirname(__file__), 'zmqtulip', '__init__.py')
+    init_py = os.path.join(os.path.dirname(__file__), 'aiozmq', '__init__.py')
     with open(init_py) as f:
         for line in f:
             match = regexp.match(line)
             if match is not None:
                 return match.group(1)
         else:
-            raise RuntimeError('Cannot find version in zmqtulip/__init__.py')
+            raise RuntimeError('Cannot find version in aiozmq/__init__.py')
 
 
-setup(name='pyzmqtulip',
+setup(name='pyaiozmq',
       version=read_version(),
       description=('zmq integration with tulip.'),
       long_description='\n\n'.join((read('README.rst'), read('CHANGES.txt'))),
@@ -35,7 +35,7 @@ def read_version():
           'Programming Language :: Python :: 3.3'],
       author='Nikolay Kim',
       author_email='[email protected]',
-      url='https://github.com/fafhrd91/pyzmqtulip/',
+      url='https://github.com/fafhrd91/pyaiozmq/',
       license='BSD',
       packages=find_packages(),
       install_requires = install_requires,

examples/tcp_echo.py

@@ -3,15 +3,15 @@
 import unittest
 import unittest.mock
 import zmq
-import zmqtulip
-import zmqtulip.core
+import aiozmq
+import aiozmq.core
 
 
 class CoreTests(unittest.TestCase):
 
     def setUp(self):
-        self.loop = zmqtulip.new_event_loop()
-        self.ctx = zmqtulip.Context(loop=self.loop)
+        self.loop = aiozmq.new_event_loop()
+        self.ctx = aiozmq.Context(loop=self.loop)
         asyncio.set_event_loop(None)
 
     def tearDown(self):
@@ -20,21 +20,21 @@ def tearDown(self):
     def test_context_global_event_loop(self):
         asyncio.set_event_loop(self.loop)
         try:
-            ctx = zmqtulip.Context()
+            ctx = aiozmq.Context()
             self.assertIs(ctx._loop, self.loop)
         finally:
             asyncio.set_event_loop(None)
 
     def test_context_socket(self):
-        ctx = zmqtulip.Context(loop=self.loop)
+        ctx = aiozmq.Context(loop=self.loop)
         self.assertIs(ctx._loop, self.loop)
 
         socket = ctx.socket(zmq.PUB)
         socket.close()
-        self.assertIsInstance(socket, zmqtulip.core.Socket)
+        self.assertIsInstance(socket, aiozmq.core.Socket)
         self.assertIs(socket._loop, self.loop)
 
-    @unittest.mock.patch('zmqtulip.core.zmq.Socket')
+    @unittest.mock.patch('aiozmq.core.zmq.Socket')
     def test_recv_err(self, zmqSocket):
         err = zmq.ZMQError()
         err.errno = -1
@@ -61,9 +61,9 @@ def test_send_checks(self):
 class CoreIntegrationalTests(unittest.TestCase):
 
     def setUp(self):
-        self.loop = zmqtulip.new_event_loop()
-        self.srv_ctx = zmqtulip.Context(loop=self.loop)
-        self.c_ctx = zmqtulip.Context(loop=self.loop)
+        self.loop = aiozmq.new_event_loop()
+        self.srv_ctx = aiozmq.Context(loop=self.loop)
+        self.c_ctx = aiozmq.Context(loop=self.loop)
         asyncio.set_event_loop(None)
 
     def tearDown(self):

examples/udp_echo.py

@@ -29,7 +29,7 @@
 from asyncio import test_utils
 
 
-import zmqtulip
+import aiozmq
 
 
 def data_file(filename):
@@ -1619,4 +1619,4 @@ def connect(cmd=None, **kwds):
 class ZmqSelectorEventLoopTests(EventLoopTestsMixin, unittest.TestCase):
 
     def create_event_loop(self):
-        return zmqtulip.new_event_loop()
+        return aiozmq.new_event_loop()

examples/wssrv.py

@@ -1,12 +1,12 @@
 import unittest
 import asyncio
-import zmqtulip
+import aiozmq
 import zmq
 
 from test import support  # import from standard python test suite
 
 
-class Protocol(zmqtulip.ZmqProtocol):
+class Protocol(aiozmq.ZmqProtocol):
 
     def __init__(self, loop):
         self.transport = None
@@ -41,7 +41,7 @@ def msg_received(self, data, *multipart):
 class ZmqEventLoopTests(unittest.TestCase):
 
     def setUp(self):
-        self.loop = zmqtulip.ZmqEventLoop()
+        self.loop = aiozmq.ZmqEventLoop()
         asyncio.set_event_loop(None)
 
     def tearDown(self):