internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cobbler: Add Python 3 support (#645)

Browse Source
This commit is contained in:
Dag Wieers
2020-12-16 13:37:31 +01:00
committed by GitHub
parent 757427cadf
commit c3ef9bf668
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/638_cobbler_py3.yml Normal file
View File

@@ -0,0 +1,2 @@
bugfixes:
- cobbler - add Python 3 support (https://github.com/ansible-collections/community.general/issues/638).

7
scripts/inventory/cobbler.py
View File

@@ -52,7 +52,10 @@ import argparse
import os import os
import re import re
from time import time from time import time
import xmlrpclib try: # Python 3
from xmlrpc.client import Server
except ImportError: # Python 2
from xmlrpclib import Server
import json import json
@@ -106,7 +109,7 @@ class CobblerInventory(object):
def _connect(self): def _connect(self):
if not self.conn: if not self.conn:
self.conn = xmlrpclib.Server(self.cobbler_host, allow_none=True) self.conn = Server(self.cobbler_host, allow_none=True)
self.token = None self.token = None
if self.cobbler_username is not None: if self.cobbler_username is not None:
self.token = self.conn.login(self.cobbler_username, self.cobbler_password) self.token = self.conn.login(self.cobbler_username, self.cobbler_password)