diff options
| author | Jonah Brüchert <jbb@kaidan.im> | 2024-04-19 23:52:23 +0200 |
|---|---|---|
| committer | Jonah Brüchert <jbb@kaidan.im> | 2024-04-19 23:52:23 +0200 |
| commit | 2724e6409534a948b5a2c212ae0a7192326c1b4c (patch) | |
| tree | fe49421ea9c00298c01d5c5c52d0687c2f4bb9fd /src/lib/Bcfg2/Client/__init__.py | |
| parent | 4d140a72fdde0e34060b9fa1ef76e05502245d20 (diff) | |
| download | bcfg2-2724e6409534a948b5a2c212ae0a7192326c1b4c.tar.gz bcfg2-2724e6409534a948b5a2c212ae0a7192326c1b4c.tar.bz2 bcfg2-2724e6409534a948b5a2c212ae0a7192326c1b4c.zip | |
Run 2to3 on the entire project
Diffstat (limited to 'src/lib/Bcfg2/Client/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 14c14a224..15fdd5234 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -74,7 +74,7 @@ def prompt(msg): # handle ^C raise SystemExit(1) except: - print("Error while reading input: %s" % sys.exc_info()[1]) + print(("Error while reading input: %s" % sys.exc_info()[1])) return False @@ -493,7 +493,7 @@ class Client(object): entries[pkey] += 1 else: entries[pkey] = 1 - multi = [e for e, c in entries.items() if c > 1] + multi = [e for e, c in list(entries.items()) if c > 1] if multi: self.logger.debug("The following entries are included multiple " "times:") @@ -868,7 +868,7 @@ class Client(object): self.logger.info('Incorrect entries: %d' % list(self.states.values()).count(False)) if phase == 'final' and list(self.states.values()).count(False): - for entry in sorted(self.states.keys(), key=lambda e: e.tag + ":" + + for entry in sorted(list(self.states.keys()), key=lambda e: e.tag + ":" + e.get('name')): if not self.states[entry]: etype = entry.get('type') |