Skip to content

Commit bf61755

Browse files
Drop winkerberos support
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
1 parent 0d481ce commit bf61755

File tree

4 files changed

+5
-16
lines changed

4 files changed

+5
-16
lines changed

requests_gssapi/gssapi_.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
try:
2-
import kerberos
3-
except ImportError:
4-
import winkerberos as kerberos
1+
import kerberos
52
import re
63
import logging
74

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
requests>=1.1.0
2-
winkerberos >= 0.5.0; sys.platform == 'win32'
3-
pykerberos >= 1.1.8, < 2.0.0; sys.platform != 'win32'
2+
pykerberos >= 1.1.8, < 2.0.0

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@ def get_version():
4949
version=get_version(),
5050
install_requires=[
5151
'requests>=1.1.0',
52+
'pykerberos>=1.1.8,<2.0.0',
5253
],
53-
extras_require={
54-
':sys_platform=="win32"': ['winkerberos>=0.5.0'],
55-
':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
56-
},
5754
test_suite='test_requests_gssapi',
5855
tests_require=['mock'],
5956
)

test_requests_gssapi.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
import requests
99

1010

11-
try:
12-
import kerberos
13-
kerberos_module_name='kerberos'
14-
except ImportError:
15-
import winkerberos as kerberos # On Windows
16-
kerberos_module_name = 'winkerberos'
11+
import kerberos
12+
kerberos_module_name='kerberos'
1713

1814
import requests_gssapi
1915
import unittest

0 commit comments

Comments
 (0)