Code fixes for future versions of Twisted and Python#1

syndbg wants to merge 3 commits intojesstess:masterjesstess/twisted-network-programming-essentials-examples:masterfrom

syndbg:mastersyndbg/twisted-network-programming-essentials-examples:masterCopy head branch name to clipboard