r46791 - fix syntax hiccup in merge
glyph-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: glyph
Date: Sun Feb 14 02:54:55 2016
New Revision: 46791
Modified:
branches/getaddrinfo-4362-3/twisted/internet/interfaces.py
Log:
fix syntax hiccup in merge
Modified: branches/getaddrinfo-4362-3/twisted/internet/interfaces.py
==============================================================================
--- branches/getaddrinfo-4362-3/twisted/internet/interfaces.py (original)
+++ branches/getaddrinfo-4362-3/twisted/internet/interfaces.py Sun Feb 14 02:54:55 2016
@@ -111,7 +111,6 @@
"""
-class IResolverSimple(Interface):
class IResolverSimple(Interface):
def getHostByName(name, timeout = (1, 3, 11, 45)):