On using a different approach: I weighed an approach like that and decided to go with what I thought was the clean/simple/easy approach.  If there were more commands that smptd.py accepted I would have probably gone with more like what you mentioned. 

Change in error text: That's fine with me.  I don't really care what it says.  I'll make the change and generate a new patch but won't be able to get it done until Monday.

Given that the inclusion of EHLO in the error text depends on another patch should I include EHLO, and maybe have to remove it later, or leave it out now and maybe have to put it in later?  2 patches, maybe, and we can pick when the time comes?

So when patches like this get applied?  If that's covered in an FAQ someplace please point me to it, I'm interested in some of the details.  I poked around a bit but couldn't find what I was looking for.