From 7c31e9544d325bfc869cba1d15cbc57f1d6a9aff Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 19 Jul 2012 17:18:57 -0400
Subject: added CherryPy-based server core

---
 src/lib/Bcfg2/Proxy.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/lib/Bcfg2/Proxy.py')

diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index eff9544da..93899c82b 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -1,13 +1,3 @@
-"""RPC client access to cobalt components.
-
-Classes:
-ComponentProxy -- an RPC client proxy to Cobalt components
-
-Functions:
-load_config -- read configuration files
-
-"""
-
 import logging
 import re
 import socket
@@ -34,7 +24,6 @@ import time
 from Bcfg2.Bcfg2Py3k import httplib, xmlrpclib, urlparse
 
 version = sys.version_info[:2]
-has_py23 = version >= (2, 3)
 has_py26 = version >= (2, 6)
 
 __all__ = ["ComponentProxy",
@@ -220,8 +209,7 @@ class SSLHTTPConnection(httplib.HTTPConnection):
             self.logger.warning("SSL key specfied, but no cert. Cannot authenticate this client with SSL.")
             self.key = None
 
-        if has_py23:
-            rawsock.settimeout(self.timeout)
+        rawsock.settimeout(self.timeout)
         self.sock = ssl.SSLSocket(rawsock, cert_reqs=other_side_required,
                                   ca_certs=self.ca, suppress_ragged_eofs=True,
                                   keyfile=self.key, certfile=self.cert,
-- 
cgit v1.2.3-1-g7c22