summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-02 15:25:24 -0500
committerDave Parks <davep@lindenlab.com>2011-05-02 15:25:24 -0500
commitc0e6d606e617e7f92fc492ffbad03f5fadb8d3a3 (patch)
treea39ed8671a71a96257bf200896dd7d484a53c9af
parenta25f8987032afede673b818fe7544975eba036b5 (diff)
STORM-1210 : Fix python merge glitch so to pass Release build (again)
-rw-r--r--indra/lib/python/indra/ipc/llmessage.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/lib/python/indra/ipc/llmessage.py b/indra/lib/python/indra/ipc/llmessage.py
index 6161badc70..91fb36b72c 100644
--- a/indra/lib/python/indra/ipc/llmessage.py
+++ b/indra/lib/python/indra/ipc/llmessage.py
@@ -26,8 +26,6 @@ THE SOFTWARE.
$/LicenseInfo$
"""
-from sets import Set, ImmutableSet
-
from compatibility import Incompatible, Older, Newer, Same
from tokenstream import TokenStream
@@ -44,8 +42,8 @@ class Template:
def compatibleWithBase(self, base):
messagenames = (
- ImmutableSet(self.messages.keys())
- | ImmutableSet(base.messages.keys())
+ frozenset(self.messages.keys())
+ | frozenset(base.messages.keys())
)
compatibility = Same()