From 97613337c6983201df9f33f3d8d6bf3ac5435c93 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sun, 6 Sep 2015 20:35:09 +0100
Subject: [PATCH] organise files, use same port number in examples

---
 .gitignore                            |  3 +++
 asyncore/TcpServer.py                 |  2 +-
 requirements.txt                      |  0
 {socketserver => select}/TcpClient.py |  2 +-
 select/TcpServer.py                   |  6 ++++--
 socketserver/TcpServer.py             |  2 +-
 socketserver/UdpClient.py             | 16 ----------------
 7 files changed, 10 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 requirements.txt
 rename {socketserver => select}/TcpClient.py (93%)
 delete mode 100644 socketserver/UdpClient.py

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ad7729
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/venv
+/.pydevproject
+/.project
diff --git a/asyncore/TcpServer.py b/asyncore/TcpServer.py
index 1c1de9f..e06c4e6 100644
--- a/asyncore/TcpServer.py
+++ b/asyncore/TcpServer.py
@@ -20,5 +20,5 @@ class SecondaryServerSocket(asyncore.dispatcher_with_send):
     def handle_close(self):
         print "Disconnected from", self.getpeername(  )
 
-MainServerSocket(8881)
+MainServerSocket(10000)
 asyncore.loop(  )
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..e69de29
diff --git a/socketserver/TcpClient.py b/select/TcpClient.py
similarity index 93%
rename from socketserver/TcpClient.py
rename to select/TcpClient.py
index 5ad1c76..51e6759 100644
--- a/socketserver/TcpClient.py
+++ b/select/TcpClient.py
@@ -1,7 +1,7 @@
 import socket
 import sys
 
-HOST, PORT = "localhost", 9999
+HOST, PORT = "localhost", 10000
 data = " ".join(sys.argv[1:])
 
 # Create a socket (SOCK_STREAM means a TCP socket)
diff --git a/select/TcpServer.py b/select/TcpServer.py
index 2a325eb..6994d9e 100644
--- a/select/TcpServer.py
+++ b/select/TcpServer.py
@@ -1,7 +1,7 @@
 import socket
 import select
 sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-sock.bind(('', 8881))
+sock.bind(('', 10000))
 sock.listen(5)
 
 # lists of sockets to watch for input and output events
@@ -34,7 +34,9 @@ try:
                     # a disconnect, give a message and clean up
                     print "disconnected from", adrs[x]
                     del adrs[x]
-                    try: ous.remove(x)
+                    try:
+                        ins.remove(x)
+                        ous.remove(x)
                     except ValueError: pass
                     x.close(  )
         for x in o:
diff --git a/socketserver/TcpServer.py b/socketserver/TcpServer.py
index fe7ca92..8fd3726 100644
--- a/socketserver/TcpServer.py
+++ b/socketserver/TcpServer.py
@@ -28,7 +28,7 @@ class MyTCPHandler(SocketServer.BaseRequestHandler):
         # self.wfile.write(self.data.upper())
 
 if __name__ == "__main__":
-    HOST, PORT = "localhost", 9999
+    HOST, PORT = "localhost", 10000
 
     # Create the server, binding to localhost on port 9999
     server = SocketServer.TCPServer((HOST, PORT), MyTCPHandler)
diff --git a/socketserver/UdpClient.py b/socketserver/UdpClient.py
deleted file mode 100644
index 1290ea2..0000000
--- a/socketserver/UdpClient.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import socket
-import sys
-
-HOST, PORT = "localhost", 9999
-data = " ".join(sys.argv[1:])
-
-# SOCK_DGRAM is the socket type to use for UDP sockets
-sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-
-# As you can see, there is no connect() call; UDP has no connections.
-# Instead, data is directly sent to the recipient via sendto().
-sock.sendto(data + "\n", (HOST, PORT))
-received = sock.recv(1024)
-
-print "Sent:     {}".format(data)
-print "Received: {}".format(received)
\ No newline at end of file