From 4ddd1821b6c8556c79c202d8a9df19c576202ec1 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 20 Oct 2015 19:01:23 +0200 Subject: ipapython.nsslib, ipalib.rpc: Remove code for Python 2.6 and below IPA hasn't supported these pythons for a while now. Reviewed-By: Tomas Babej --- ipapython/nsslib.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ipapython') diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py index 0d02e768b..52cf63f03 100644 --- a/ipapython/nsslib.py +++ b/ipapython/nsslib.py @@ -291,13 +291,7 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback): """ try: # FIXME: httplib uses old-style classes so super doesn't work - # Python 2.7 changed the API for endheaders. This is an attempt - # to work across versions - (major, minor, micro, releaselevel, serial) = sys.version_info - if major == 2 and minor < 7: - httplib.HTTPConnection.endheaders(self) - else: - httplib.HTTPConnection.endheaders(self, message) + httplib.HTTPConnection.endheaders(self, message) except NSPRError as e: self.close() raise e -- cgit