From 5d0d362e3ff039467149e69ae17c7dcdf8b2a952 Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Sat, 23 Feb 2013 22:06:16 +0000 Subject: [PATCH] Ensure jail names return in alphabetical order in status Primarily to support testing as order can switch --- server/server.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/server.py b/server/server.py index 0e1b6c97..4a086078 100644 --- a/server/server.py +++ b/server/server.py @@ -282,12 +282,9 @@ class Server: def status(self): try: self.__lock.acquire() - jailList = '' - for jail in self.__jails.getAll(): - jailList += jail + ', ' - length = len(jailList) - if not length == 0: - jailList = jailList[:length-2] + jails = list(self.__jails.getAll()) + jails.sort() + jailList = ", ".join(jails) ret = [("Number of jail", self.__jails.size()), ("Jail list", jailList)] return ret