Bump Twisted dependency to 13.1.0 (released June 2013)

requirements.txt

@@ -1,4 +1,4 @@
-Twisted>=10.0.0
+Twisted>=13.1.0
 lxml
 pyOpenSSL
 cssselect>=0.9

scrapy/xlib/tx/_newclient.py

@@ -38,26 +38,21 @@
 from twisted.internet.defer import Deferred, succeed, fail, maybeDeferred
 from twisted.internet.defer import CancelledError
 from twisted.internet.protocol import Protocol
-from twisted.protocols.basic import LineReceiver
-from twisted.web.iweb import UNKNOWN_LENGTH
-from twisted.web.http_headers import Headers
+#from twisted.protocols.basic import LineReceiver
+from twisted.web.iweb import UNKNOWN_LENGTH, IResponse
+#from twisted.web.http_headers import Headers
 from twisted.web.http import NO_CONTENT, NOT_MODIFIED
 from twisted.web.http import _DataLoss, PotentialDataLoss
 from twisted.web.http import _IdentityTransferDecoder, _ChunkedTransferDecoder
 
 from twisted.web._newclient import (
     BadHeaders, ExcessWrite, ParseError, BadResponseVersion, _WrapperException,
-    RequestGenerationFailed, RequestTransmissionFailed,
-    WrongBodyLength, ResponseDone, RequestNotSent,
-    LengthEnforcingConsumer, makeStatefulDispatcher, ChunkedEncoder,
-    TransportProxyProducer,
+    RequestGenerationFailed, RequestTransmissionFailed, ConnectionAborted,
+    WrongBodyLength, ResponseDone, ResponseFailed, RequestNotSent,
+    ResponseNeverReceived, HTTPParser, HTTPClientParser, Request,
+    LengthEnforcingConsumer, makeStatefulDispatcher, Response, ChunkedEncoder,
+    TransportProxyProducer, HTTP11ClientProtocol
 )
-# newer than 10.0.0
-#from twisted.web._newclient import (
-#    ConnectionAborted, ResponseFailed, ResponseNeverReceived, HTTPParser,
-#    HTTPClientParser, Request, Response, HTTP11ClientProtocol,
-#)
-from .iweb import IResponse
 
 # States HTTPParser can be in
 STATUS = 'STATUS'
@@ -130,7 +125,7 @@ class RequestTransmissionFailed(_WrapperException):
     @ivar reasons: A C{list} of one or more L{Failure} instances giving the
         reasons the request transmission was considered to have failed.
     """
-}}} '''
+
 
 
 class ConnectionAborted(Exception):
@@ -139,7 +134,7 @@ class ConnectionAborted(Exception):
     """
 
 
-''' {{{
+
 class WrongBodyLength(Exception):
     """
     An L{IBodyProducer} declared the number of bytes it was going to
@@ -155,7 +150,7 @@ class ResponseDone(Exception):
     protocol passed to L{Response.deliverBody} and indicates that the entire
     response has been delivered.
     """
-}}} '''
+
 
 
 class ResponseFailed(_WrapperException):
@@ -182,7 +177,7 @@ class ResponseNeverReceived(ResponseFailed):
     """
 
 
-''' {{{
+
 class RequestNotSent(Exception):
     """
     L{RequestNotSent} indicates that an attempt was made to issue a request but
@@ -191,7 +186,7 @@ class RequestNotSent(Exception):
     to send a request using a protocol which is no longer connected to a
     server.
     """
-}}} '''
+
 
 
 def _callAppFunction(function):
@@ -777,7 +772,7 @@ def stopWriting(self):
         _callAppFunction(self.bodyProducer.stopProducing)
 
 
-''' {{{
+
 class LengthEnforcingConsumer:
     """
     An L{IConsumer} proxy which enforces an exact length requirement on the
@@ -1201,7 +1196,7 @@ def pauseProducing(self):
         """
         if self._producer is not None:
             self._producer.pauseProducing()
-}}} '''
+
 
 
 class HTTP11ClientProtocol(Protocol):
@@ -1527,3 +1522,4 @@ def abort(self):
         d = Deferred()
         self._abortDeferreds.append(d)
         return d
+}}} '''

scrapy/xlib/tx/client.py

@@ -29,23 +29,18 @@ def urlunparse(parts):
 from twisted.web import http
 from twisted.internet import defer, protocol, task, reactor
 from twisted.internet.interfaces import IProtocol
+from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint
 from twisted.python import failure
 from twisted.python.components import proxyForInterface
 from twisted.web import error
-from twisted.web.iweb import UNKNOWN_LENGTH, IBodyProducer
+from twisted.web.iweb import UNKNOWN_LENGTH, IBodyProducer, IResponse
 from twisted.web.http_headers import Headers
 
 from twisted.web.client import (
-    PartialDownloadError,
+    PartialDownloadError, FileBodyProducer,
+    CookieAgent, GzipDecoder, ContentDecoderAgent, RedirectAgent,
+    Agent, ProxyAgent, HTTPConnectionPool, readBody,
 )
-# newer than 10.0.0
-#from twisted.web.client import (
-#    CookieAgent, GzipDecoder, ContentDecoderAgent, RedirectAgent, FileBodyProducer,
-#    HTTPConnectionPool, Agent, ProxyAgent,
-#)
-
-from .endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint
-from .iweb import IResponse
 
 ''' {{{
 class PartialDownloadError(error.Error):
@@ -54,7 +49,7 @@ class PartialDownloadError(error.Error):
 
     @ivar response: All of the response body which was downloaded.
     """
-}}} '''
+
 
 class _URL(tuple):
     """
@@ -138,22 +133,21 @@ def _makeGetterFactory(url, factoryFactory, contextFactory=None,
     else:
         reactor.connectTCP(host, port, factory)
     return factory
-
+}}} '''
 
 # The code which follows is based on the new HTTP client implementation.  It
 # should be significantly better than anything above, though it is not yet
 # feature equivalent.
 
-from twisted.web.error import SchemeNotSupported
-from ._newclient import Request, Response, HTTP11ClientProtocol
-from twisted.web._newclient import ResponseDone
-from ._newclient import ResponseFailed
-from twisted.web._newclient import RequestNotSent, RequestTransmissionFailed
-from twisted.web._newclient import (
-    PotentialDataLoss, _WrapperException)
-from ._newclient import (
-    ResponseNeverReceived)
+#from twisted.web.error import SchemeNotSupported
+from twisted.web._newclient import Response
+#from twisted.web._newclient import Request, HTTP11ClientProtocol
+from twisted.web._newclient import ResponseDone, ResponseFailed
+#from twisted.web._newclient import RequestNotSent, RequestTransmissionFailed
+#from twisted.web._newclient import (
+#    ResponseNeverReceived, PotentialDataLoss, _WrapperException)
 
+''' {{{
 try:
     from twisted.internet.ssl import ClientContextFactory
 except ImportError:
@@ -1170,7 +1164,7 @@ def readBody(response):
     d = defer.Deferred()
     response.deliverBody(_ReadBodyProtocol(response.code, response.phrase, d))
     return d
-
+}}} '''
 
 
 __all__ = [

scrapy/xlib/tx/endpoints.py

@@ -21,38 +21,33 @@
 import warnings
 
 from twisted.internet import interfaces, defer, error, fdesc
-from twisted.internet.protocol import (
-        ClientFactory, Protocol, Factory)
+#from twisted.internet.protocol import (
+#        ClientFactory, Protocol)
+from twisted.internet.protocol import Factory
 #from twisted.internet import threads, ProcessProtocol
 from twisted.internet.interfaces import IStreamServerEndpointStringParser
-from twisted.internet.interfaces import IStreamClientEndpointStringParser
+#from twisted.internet.interfaces import IStreamClientEndpointStringParser
 from twisted.python.filepath import FilePath
 #from twisted.python.failure import Failure
 #from twisted.python import log
-from twisted.python.components import proxyForInterface
+#from twisted.python.components import proxyForInterface
 
 from twisted.plugin import IPlugin, getPlugins
 #from twisted.internet import stdio
 
-# newer than 10.0.0
-#from twisted.internet.endpoints import (
-#    TCP4ServerEndpoint, TCP6ServerEndpoint, TCP4ClientEndpoint, SSL4ServerEndpoint, SSL4ClientEndpoint,
-#    UNIXServerEndpoint, UNIXClientEndpoint, AdoptedStreamServerEndpoint, connectProtocol,
-#    quoteStringArgument,
-#    serverFromString, #> using newer _parseSSL, _tokenize in _serverParsers
-#    clientFromString, #> using newer _clientParsers
-#    _WrappingProtocol, _WrappingFactory, _TCPServerEndpoint,
-#    _parseTCP, _parseUNIX, _loadCAsFromDir,
-#    _parseSSL, _tokenize,
-#    _parseClientTCP, _parseClientSSL, _parseClientUNIX,
-#)
-
-from .interfaces import IFileDescriptorReceiver
+from twisted.internet.endpoints import (
+    clientFromString, serverFromString, quoteStringArgument,
+    TCP4ServerEndpoint, TCP6ServerEndpoint,
+    TCP4ClientEndpoint, TCP6ClientEndpoint,
+    UNIXServerEndpoint, UNIXClientEndpoint,
+    SSL4ServerEndpoint, SSL4ClientEndpoint,
+    AdoptedStreamServerEndpoint, connectProtocol,
+)
 
 
 __all__ = ["TCP4ClientEndpoint", "SSL4ServerEndpoint"]
 
-
+''' {{{
 class _WrappingProtocol(Protocol):
     """
     Wrap another protocol in order to notify my user when a connection has
@@ -71,7 +66,7 @@ def __init__(self, connectedDeferred, wrappedProtocol):
         self._wrappedProtocol = wrappedProtocol
 
         for iface in [interfaces.IHalfCloseableProtocol,
-                      IFileDescriptorReceiver]:
+                      interfaces.IFileDescriptorReceiver]:
             if iface.providedBy(self._wrappedProtocol):
                 directlyProvides(self, iface)
 
@@ -609,6 +604,7 @@ def listen(self, factory):
 
 
 
+
 def _parseTCP(factory, port, interface="", backlog=50):
     """
     Internal parser function for L{_parseServer} to convert the string
@@ -1280,4 +1276,4 @@ class OneShotFactory(Factory):
         def buildProtocol(self, addr):
             return protocol
     return endpoint.connect(OneShotFactory())
-
+}}} '''