From 4403e6c1fe364e6782dc18e1a5861c08974cfdb3 Mon Sep 17 00:00:00 2001
From: Darragh Bailey <dbailey@hp.com>
Date: Fri, 3 Jul 2009 12:43:49 -0400
Subject: [PATCH] (closes #575) explicitly import set() on py2.3

---
 buildbot/buildslave.py          | 3 +++
 buildbot/status/mail.py         | 4 ++++
 buildbot/test/test_changes.py   | 4 ++++
 buildbot/test/test_mailparse.py | 4 ++++
 buildbot/test/test_status.py    | 4 ++++
 5 files changed, 19 insertions(+)

diff --git a/buildbot/buildslave.py b/buildbot/buildslave.py
index 154384e..b18882f 100644
--- a/buildbot/buildslave.py
+++ b/buildbot/buildslave.py
@@ -15,6 +15,9 @@ from buildbot.status.mail import MailNotifier
 from buildbot.interfaces import IBuildSlave, ILatentBuildSlave
 from buildbot.process.properties import Properties
 
+import sys
+if sys.version_info[:3] < (2,4,0):
+    from sets import Set as set
 
 class AbstractBuildSlave(NewCredPerspective, service.MultiService):
     """This is the master-side representative for a remote buildbot slave.
diff --git a/buildbot/status/mail.py b/buildbot/status/mail.py
index 41223bb..1832c6d 100644
--- a/buildbot/status/mail.py
+++ b/buildbot/status/mail.py
@@ -22,6 +22,10 @@ from buildbot import interfaces, util
 from buildbot.status import base
 from buildbot.status.builder import FAILURE, SUCCESS, WARNINGS, Results
 
+import sys
+if sys.version_info[:3] < (2,4,0):
+    from sets import Set as set
+
 VALID_EMAIL = re.compile("[a-zA-Z0-9\.\_\%\-\+]+@[a-zA-Z0-9\.\_\%\-]+.[a-zA-Z]{2,6}")
 
 def message(attrs):
diff --git a/buildbot/test/test_changes.py b/buildbot/test/test_changes.py
index faebe7b..42d47e6 100644
--- a/buildbot/test/test_changes.py
+++ b/buildbot/test/test_changes.py
@@ -7,6 +7,10 @@ from buildbot import master
 from buildbot.changes import pb
 from buildbot.scripts import runner
 
+import sys
+if sys.version_info[:3] < (2,4,0):
+    from sets import Set as set
+
 d1 = {'files': ["Project/foo.c", "Project/bar/boo.c"],
       'who': "marvin",
       'comments': "Some changes in Project"}
diff --git a/buildbot/test/test_mailparse.py b/buildbot/test/test_mailparse.py
index 2607730..8228f20 100644
--- a/buildbot/test/test_mailparse.py
+++ b/buildbot/test/test_mailparse.py
@@ -6,6 +6,10 @@ from twisted.trial import unittest
 from twisted.python import util
 from buildbot.changes import mail
 
+import sys
+if sys.version_info[:3] < (2,4,0):
+    from sets import Set as set
+
 class TestFreshCVS(unittest.TestCase):
 
     def get(self, msg):
diff --git a/buildbot/test/test_status.py b/buildbot/test/test_status.py
index 7d6f628..270839f 100644
--- a/buildbot/test/test_status.py
+++ b/buildbot/test/test_status.py
@@ -15,6 +15,10 @@ from buildbot.changes.changes import Change
 from buildbot.process.builder import Builder
 from time import sleep
 
+import sys
+if sys.version_info[:3] < (2,4,0):
+    from sets import Set as set
+
 mail = None
 try:
     from buildbot.status import mail
-- 
2.11.4.GIT