diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-15 13:38:04 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-15 13:38:04 -0500 |
| commit | 0366ab745df68660f5966c7fb901766bc2c2d4d4 (patch) | |
| tree | 94ccd98bfde8f543c84cbfa1ca5e955e40f62b66 /src/lib/SSLServer.py | |
| parent | df2fbddbe59b21f41eeddc84d75d852a477454b0 (diff) | |
| download | bcfg2-0366ab745df68660f5966c7fb901766bc2c2d4d4.tar.gz bcfg2-0366ab745df68660f5966c7fb901766bc2c2d4d4.tar.bz2 bcfg2-0366ab745df68660f5966c7fb901766bc2c2d4d4.zip | |
SSLServer: Fix another syntax error for python 2
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/SSLServer.py')
| -rw-r--r-- | src/lib/SSLServer.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py index fa7d4e145..d5d2f2b3a 100644 --- a/src/lib/SSLServer.py +++ b/src/lib/SSLServer.py @@ -195,7 +195,11 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): self.logger.error("No authentication data presented") return False auth_type, auth_content = header.split() - auth_content = base64.standard_b64decode(bytes(auth_content.encode('ascii'))) + try: + # py3k compatibility + auth_content = base64.standard_b64decode(auth_content) + except TypeError: + auth_content = base64.standard_b64decode(bytes(auth_content.encode('ascii'))) try: # py3k compatibility try: |