diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-10-20 19:01:23 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-10-27 17:23:25 +0100 |
| commit | 4ddd1821b6c8556c79c202d8a9df19c576202ec1 (patch) | |
| tree | 5ce828a73865c10ec72160028eadaeb338a72bfc /ipapython/nsslib.py | |
| parent | beb6a3236d5c10acd990aaf92eddc74fee456909 (diff) | |
| download | freeipa-4ddd1821b6c8556c79c202d8a9df19c576202ec1.tar.gz freeipa-4ddd1821b6c8556c79c202d8a9df19c576202ec1.tar.xz freeipa-4ddd1821b6c8556c79c202d8a9df19c576202ec1.zip | |
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 <tbabej@redhat.com>
Diffstat (limited to 'ipapython/nsslib.py')
| -rw-r--r-- | ipapython/nsslib.py | 8 |
1 files changed, 1 insertions, 7 deletions
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 |