IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: Remove comparison >=2 of debnug log level

Browse Source 
We have only one debug log level and it causes issues with py3.
...
  File "/usr/lib/python3.5/site-packages/ipaserver/rpcserver.py", line 490, in marshal
    response, version, pretty_print=self.api.env.debug >= 2
TypeError: unorderable types: str() >= int()

https://pagure.io/freeipa/issue/4985

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti
2017-06-19 19:11:10 +02:00
parent d5fc0ddd87
commit 8416d5772d
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -66,6 +66,7 @@ env:
TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml" TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml"
TESTS_TO_RUN="test_cmdline TESTS_TO_RUN="test_cmdline
test_ipalib test_ipalib
test_ipapython
test_ipaserver/test_changepw.py test_ipaserver/test_changepw.py
test_pkcs10 test_pkcs10
test_xmlrpc/test_location_plugin.py test_xmlrpc/test_location_plugin.py
@@ -91,13 +92,6 @@ env:
test_xmlrpc/test_sudorule_plugin.py" test_xmlrpc/test_sudorule_plugin.py"
### Tests which haven't been ported to py3 yet ### ### Tests which haven't been ported to py3 yet ###
## test_install ## test_install
## test_ipapython
# test_ipapython/test_cookie.py
# test_ipapython/test_dn.py
# test_ipapython/test_ipautil.py
# test_ipapython/test_ipavalidate.py
# test_ipapython/test_kerberos.py
# test_ipapython/test_ssh.py
# test_ipaserver/httptest.py # test_ipaserver/httptest.py
# test_ipaserver/test_dnssec.py # test_ipaserver/test_dnssec.py
# test_ipaserver/test_install/test_adtrustinstance.py # test_ipaserver/test_install/test_adtrustinstance.py

2
ipaserver/rpcserver.py
View File

@@ -487,7 +487,7 @@ class jsonserver(WSGIExecutioner, HTTP_Status):
version=unicode(VERSION), version=unicode(VERSION),
) )
dump = json_encode_binary( dump = json_encode_binary(
response, version, pretty_print=self.api.env.debug >= 2 response, version, pretty_print=self.api.env.debug
) )
return dump.encode('utf-8') return dump.encode('utf-8')

2
ipatests/test_ipapython/test_session_storage.py
View File

@@ -22,7 +22,7 @@ class test_session_storage(object):
# os.environ['KRB5CCNAME'] = 'FILE:%s/ccache' % tmpdir # os.environ['KRB5CCNAME'] = 'FILE:%s/ccache' % tmpdir
self.principal = 'admin' self.principal = 'admin'
self.key = 'X-IPA-test-session-storage' self.key = 'X-IPA-test-session-storage'
self.data = 'Test Data' self.data = b'Test Data'
def test_01(self): def test_01(self):
session_storage.store_data(self.principal, self.key, self.data) session_storage.store_data(self.principal, self.key, self.data)