Merge lp:~maxb/launchpad/wrongly-resolved-conflict into lp:launchpad/db-devel

[Max Bowsher]

Removes one last unused import of sets which was left in db-devel.

[Max Bowsher (maxb)]

Michael's resolution of the stable->db-devel conflict brought back a now-spurious 'import sets' which I'd earlier removed in db-devel 8980 "[r=gmb][ui=none][bug=none] Remove use of the deprecated sets module."

[Michael Nelson (michael.nelson)]

Just FTR:

22:39 < maxb> noodles775: You resolved my conflict wrong :-/
23:31 < noodles775> maxb: er, I'm not sure how that's possible? I simply merged stable->db-devel, and the only conflict was this
23:32 < noodles775> http://pastebin.ubuntu.com/375040/
23:32 < noodles775> ie. an import which was no longer used in the file.
23:32 < maxb> *blink*
23:32 < maxb> When I did my merge, "import sets" was inside the conflict markers too
23:35 < noodles775> maxb: is it just the lint on the file then? Or is there a bigger problem?
23:36 < maxb> Well, the objective of one of my earlier branches was to remove all imports of 'sets' from launchpad, since it raises
              DeprecationWarnings in python 2.6
23:38 < noodles775> I see. Strange that it didn't appear in the conflict then.
23:39 < noodles775> Night.
23:44 < noodles775> maxb: Just checking out of interest, the stable revision that I merged has the sha removed, but not sets, so the
                    diff makes sense?: http://pastebin.ubuntu.com/375050/
23:45 < noodles775> That's stable r10312
23:48 < noodles775> maxb: in fact, bzr diff -c 10306 lib/lp/services/mail/sendmail.py seems to show that the import of sets wasn't
                    removed in that rev, but was *moved*.
23:48 < maxb> Indeed, sets was removed in db-devel
23:48 < maxb> This was because it happened to touch a couple of scripts in the schema dir :-/
23:48 < noodles775> I see.

review: Approve (code)

=== modified file 'lib/lp/services/mail/sendmail.py'
--- lib/lp/services/mail/sendmail.py	2010-02-12 09:08:43 +0000
+++ lib/lp/services/mail/sendmail.py	2010-02-12 21:44:16 +0000
@@ -27,7 +27,6 @@
 
 
 import hashlib
-import sets
 
 from binascii import b2a_qp
 from email.Encoders import encode_base64