Merge

5 files changed, 6 insertions, 26 deletions

diff --git a/examples/chat_server.py b/examples/chat_server.py
index 3897c0f..bf24c98 100644
--- a/examples/chat_server.py
+++ b/examples/chat_server.py
@@ -1,5 +1,4 @@
 import eventlet
-from eventlet.green import socket
 
 participants = []
 
@@ -17,9 +16,7 @@ def read_chat_forever(writer, reader):
 
 try:
     print "ChatServer starting up on port 3000"
-    server = socket.socket()
-    server.bind(('0.0.0.0', 3000))
-    server.listen(50)
+    server = eventlet.listen(('0.0.0.0', 3000))
     while True:
         new_connection, address = server.accept()
         print "Participant joined chat."
diff --git a/examples/echoserver.py b/examples/echoserver.py
index 3c367a8..0888688 100644
--- a/examples/echoserver.py
+++ b/examples/echoserver.py
@@ -11,7 +11,6 @@ and then 'quit')
 """
 
 import eventlet
-from eventlet.green import socket
 
 def handle(fd):
     print "client connected"
@@ -25,10 +24,7 @@ def handle(fd):
     print "client disconnected"
 
 print "server socket listening on port 6000"
-server = socket.socket()
-server.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR, 1)
-server.bind(('0.0.0.0', 6000))
-server.listen(50)
+server = eventlet.listen(('0.0.0.0', 6000))
 pool = eventlet.GreenPool()
 while True:
     try:
diff --git a/examples/feedscraper.py b/examples/feedscraper.py
index c037145..b9e7e11 100644
--- a/examples/feedscraper.py
+++ b/examples/feedscraper.py
@@ -32,9 +32,4 @@ def app(environ, start_response):
 
 if __name__ == '__main__':
     from eventlet import wsgi
-    from eventlet.green import socket
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sock.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR, 1)
-    sock.bind(('localhost', 9010))
-    sock.listen(50)
-    wsgi.server(sock, app)
\ No newline at end of file
+    wsgi.server(eventlet.listen(('localhost', 9010)), app)
\ No newline at end of file
diff --git a/examples/websocket.py b/examples/websocket.py
index afeb103..2cef80c 100644
--- a/examples/websocket.py
+++ b/examples/websocket.py
@@ -137,9 +137,5 @@ def dispatch(environ, start_response):
         
 if __name__ == "__main__":
     # run an example app from the command line            
-    from eventlet.green import socket
-    listener = socket.socket()
-    listener.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR, 1)
-    listener.bind(('localhost', 7000))
-    listener.listen(500)
+    listener = eventlet.listen(('localhost', 7000))
     wsgi.server(listener, dispatch)
\ No newline at end of file
diff --git a/examples/wsgi.py b/examples/wsgi.py
index 93469fd..ba3f433 100644
--- a/examples/wsgi.py
+++ b/examples/wsgi.py
@@ -5,8 +5,8 @@ multiple threads, and graceful code reloading, see:
 http://pypi.python.org/pypi/Spawning/
 """
 
+import eventlet
 from eventlet import wsgi
-from eventlet.green import socket
 
 def hello_world(env, start_response):
     if env['PATH_INFO'] != '/':
@@ -15,8 +15,4 @@ def hello_world(env, start_response):
     start_response('200 OK', [('Content-Type', 'text/plain')])
     return ['Hello, World!\r\n']
         
-sock = socket.socket()
-sock.bind(('', 8090))
-sock.listen(500)
-
-wsgi.server(sock, hello_world)
+wsgi.server(eventlet.listen(('', 8090)), hello_world)