r47167 - fix remaining references to _exc

Author: glyph
Date: Tue Apr  5 16:59:29 2016
New Revision: 47167

Modified:
   branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/_wrapper.py
   branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/test/test_v2parser.py
   branches/haproxy-endpoint-8203-2/twisted/python/dist3.py

Log:
fix remaining references to _exc

Modified: branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/_wrapper.py
==============================================================================
--- branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/_wrapper.py	(original)
+++ branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/_wrapper.py	Tue Apr  5 16:59:29 2016
@@ -11,7 +11,7 @@
 from twisted.internet import interfaces
 from twisted.internet.endpoints import _WrapperServerEndpoint
 
-from ._exc import InvalidProxyHeader
+from ._exceptions import InvalidProxyHeader
 from ._v1parser import V1Parser
 from ._v2parser import V2Parser
 

Modified: branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/test/test_v2parser.py
==============================================================================
--- branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/test/test_v2parser.py	(original)
+++ branches/haproxy-endpoint-8203-2/twisted/protocols/haproxy/test/test_v2parser.py	Tue Apr  5 16:59:29 2016
@@ -8,7 +8,7 @@
 from twisted.trial import unittest
 from twisted.internet import address
 
-from .. import _exc
+from .._exceptions import InvalidProxyHeader
 from .. import _v2parser
 
 V2_SIGNATURE = b'\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A'
@@ -150,7 +150,7 @@
         """
         header = _makeHeaderIPv4(sig=b'\x00'*12)
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             _v2parser.V2Parser.parse,
             header,
         )
@@ -162,7 +162,7 @@
         """
         header = _makeHeaderIPv4(verCom=b'\x11')
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             _v2parser.V2Parser.parse,
             header,
         )
@@ -174,7 +174,7 @@
         """
         header = _makeHeaderIPv4(verCom=b'\x23')
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             _v2parser.V2Parser.parse,
             header,
         )
@@ -186,7 +186,7 @@
         """
         header = _makeHeaderIPv4(famProto=b'\x40')
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             _v2parser.V2Parser.parse,
             header,
         )
@@ -198,7 +198,7 @@
         """
         header = _makeHeaderIPv4(famProto=b'\x24')
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             _v2parser.V2Parser.parse,
             header,
         )
@@ -373,7 +373,7 @@
         testValue = b'NEEDMOREDATA'
         parser = _v2parser.V2Parser()
         self.assertRaises(
-            _exc.InvalidProxyHeader,
+            InvalidProxyHeader,
             parser.feed,
             testValue,
         )

Modified: branches/haproxy-endpoint-8203-2/twisted/python/dist3.py
==============================================================================
--- branches/haproxy-endpoint-8203-2/twisted/python/dist3.py	(original)
+++ branches/haproxy-endpoint-8203-2/twisted/python/dist3.py	Tue Apr  5 16:59:29 2016
@@ -160,7 +160,7 @@
     "twisted.protocols.telnet",
     "twisted.protocols.test.__init__",
     "twisted.protocols.haproxy.__init__",
-    "twisted.protocols.haproxy._exc",
+    "twisted.protocols.haproxy._exceptions",
     "twisted.protocols.haproxy._info",
     "twisted.protocols.haproxy._interfaces",
     "twisted.protocols.haproxy._v1parser",