removed httplient from net and added the httpurl stand-alone module i…

…n utils

.gitignore

@@ -1,15 +1,17 @@
 *.pyc
 *.pyd
 *.so
-build/*
-docs/build/*
-dist/*
-htmlcov/*
+__pycache__
+build
+docs/build
+dist
+htmlcov
+htmlprof
 .coverage
 .project
 .pydevproject
 cfg.py
 MANIFEST
-.settings/*
+.settings
 lib/src/parser.c
 pulsar/http/cparser/parser.*

pulsar/__init__.py

@@ -45,8 +45,7 @@ class CLEAR_ERRORS(object):
 from .utils.exceptions import *
 from .utils.sock import *
 from .utils import system
-from .utils.py2py3 import ispy3k, to_string, is_string, native_str,\
-                            to_bytestring
+from .utils.httpurl import ispy3k, to_string, native_str, to_bytes
 platform = system.platform
 
 from .utils.config import *

pulsar/apps/rpc/handlers.py

@@ -1,8 +1,7 @@
 import sys
 import inspect
 
-from pulsar import make_async, net, NOT_DONE, LogginMixin, to_bytestring,\
-                    Failure
+from pulsar import make_async, net, NOT_DONE, LogginMixin, to_bytes, Failure
 from pulsar.utils.tools import checkarity
 from pulsar.apps.wsgi import WsgiResponse
 
@@ -145,7 +144,7 @@ def default_content(self):
 
         self.status_code = status_code
         self.content_type = request.content_type
-        yield to_bytestring(result)
+        yield to_bytes(result)
 
 
 class MetaRpcHandler(type):

pulsar/apps/rpc/jsonrpc.py

@@ -15,8 +15,7 @@
 
 import pulsar
 from pulsar.utils.tools import gen_unique_id
-from pulsar.net import HttpClient
-from pulsar.utils.http import to_string
+from pulsar.utils.httpurl import to_string, HttpClient
 from pulsar.utils.py2py3 import range
 from pulsar.utils.jsontools import DefaultJSONEncoder, DefaultJSONHook
 

pulsar/apps/ws/handler.py

@@ -1,7 +1,7 @@
 import logging
 from uuid import uuid4
 
-from pulsar.utils.py2py3 import to_bytestring
+from pulsar import to_bytes
 
 from .frame import *
 
@@ -105,7 +105,7 @@ def on_close(self):
     def write_message(self, message, binary=False):
         """Sends the given message to the client of this Web Socket."""
         msg = frame(version = self.version,
-                    message = to_bytestring(message),
+                    message = to_bytes(message),
                     binary = binary)
         self.stream.write(msg)
 

pulsar/apps/ws/middleware.py

@@ -9,8 +9,8 @@
 from functools import partial
 
 import pulsar
-from pulsar.utils.py2py3 import ispy3k, to_bytestring, native_str, BytesIO,\
-                                itervalues
+from pulsar.utils.httpurl import ispy3k, to_bytes, native_str, itervalues  
+from pulsar.utils.py2py3 import BytesIO
 from pulsar.apps.wsgi import WsgiResponse
 
 if ispy3k:
@@ -147,7 +147,7 @@ def handle_handshake(self, environ, start_response):
         return client.start(environ, ws_protocols, ws_extensions)
 
     def challenge_response(self, key):
-        sha1 = hashlib.sha1(to_bytestring(key+self.WS_KEY))
+        sha1 = hashlib.sha1(to_bytes(key+self.WS_KEY))
         return native_str(base64.b64encode(sha1.digest()))
 
     def get_parser(self):

pulsar/apps/wsgi/wsgi.py

@@ -4,9 +4,8 @@
 
 import pulsar
 from pulsar import make_async, Deferred, raise_failure, NOT_DONE
-from pulsar.utils.http import parse_authorization_header, Headers,\
-                                SimpleCookie, set_cookie
-from pulsar.net import responses
+from pulsar.utils.httpurl import parse_authorization_header, Headers,\
+                                    SimpleCookie, set_cookie, responses
 
 from .middleware import is_streamed
 

pulsar/async/eventloop.py

@@ -10,7 +10,7 @@
 from pulsar.utils.system import IObase, IOpoll, close_on_exec, platform, Waker
 from pulsar.utils.tools import gen_unique_id
 from pulsar.utils.log import Synchronized
-from pulsar.utils.collections import WeakList
+from pulsar.utils.structures import WeakList
 
 from .defer import Deferred
 

pulsar/async/iostream.py

@@ -38,8 +38,7 @@ class IOStream(object):
     :meth:`on_init` callback.
 '''    
     def __init__(self, socket, max_buffer_size=None,
-                 read_chunk_size = None, actor = None,
-                 **kwargs):
+                 read_chunk_size=None, actor=None, **kwargs):
         self.socket = socket
         self.socket.setblocking(self.blocking())
         self.MAX_BODY = 1024 * 128

pulsar/lib/fallback/http.py

@@ -30,7 +30,7 @@
 import sys
 import zlib
 
-from pulsar.utils.http import *
+from pulsar.utils.httpurl import *
 
 
 __all__ = ['HttpParser',

pulsar/net/__init__.py

@@ -1,13 +1,11 @@
-'''\
-The ``net`` module provides you with asynchronous networked primitive
+'''The ``net`` module provides asynchronous networked primitive
 called ``stream``. It can be assessed by::
 
     from pulsar import net
 '''
 from .base import *
 from .tcp import *
 from .http import *
-from .client import *