Added __call__ and __close methods to ServerProxy

- Allows to use the 'client("close")()' method to close the
  transport layer of a ServerProxy, even on Python 2.6
  => Fixes joshmarshall#2
- Updated tests to _really_ close the transport layer
  (and not just to retrieve the closing method)

Author: tcalmant

jsonrpclib/jsonrpc.py

@@ -386,6 +386,29 @@ def __getattr__(self, name):
         # Same as original, just with new _Method reference
         return _Method(self._request, name)
 
+    def __close(self):
+        """
+        Closes the transport layer
+        """
+        self.__transport.close()
+
+
+    def __call__(self, attr):
+        """
+        A workaround to get special attributes on the ServerProxy
+        without interfering with the magic __getattr__
+
+        (code from xmlrpclib in Python 2.7)
+        """
+        if attr == "close":
+            return self.__close
+
+        elif attr == "transport":
+            return self.__transport
+
+        raise AttributeError("Attribute {0} not found".format(attr))
+
+
     @property
     def _notify(self):
         # Just like __getattr__, but with notify namespace.

tests.py

@@ -190,7 +190,7 @@ def tearDown(self):
         Post-test clean up
         """
         # Close the client
-        self.client("close")
+        self.client("close")()
 
         # Stop the server
         self.server.stop()