From c0e6d606e617e7f92fc492ffbad03f5fadb8d3a3 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 2 May 2011 15:25:24 -0500
Subject: [PATCH] STORM-1210 : Fix python merge glitch so to pass Release build
(again)
---
indra/lib/python/indra/ipc/llmessage.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/lib/python/indra/ipc/llmessage.py b/indra/lib/python/indra/ipc/llmessage.py
index 6161badc706..91fb36b72c6 100644
--- a/indra/lib/python/indra/ipc/llmessage.py
+++ b/indra/lib/python/indra/ipc/llmessage.py
@@ -26,8 +26,6 @@
$/LicenseInfo$
"""
-from sets import Set, ImmutableSet
-
from compatibility import Incompatible, Older, Newer, Same
from tokenstream import TokenStream
@@ -44,8 +42,8 @@ def addMessage(self, m):
def compatibleWithBase(self, base):
messagenames = (
- ImmutableSet(self.messages.keys())
- | ImmutableSet(base.messages.keys())
+ frozenset(self.messages.keys())
+ | frozenset(base.messages.keys())
)
compatibility = Same()
--
GitLab