embed a copy of the generated code (twisted)

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082273 13f79535-47bb-0310-9956-ffa450edef68

drivers/txpy/setup.py

@@ -24,7 +24,7 @@ setup(
     description="Cassandra Query Language driver",
     long_description=open(abspath(join(dirname(__file__), 'README'))).read(),
     url="http://cassandra.apache.org",
-    packages=["txcql"],
+    packages=["txcql", "txcql.cassandra"],
     requires=["thrift"],
     provides=["txcql"],
     classifiers=[

drivers/txpy/txcql/cassandra/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants', 'Cassandra']

drivers/txpy/txcql/cassandra/constants.py

@@ -0,0 +1,10 @@
+#
+# Autogenerated by Thrift
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+from thrift.Thrift import *
+from ttypes import *
+
+VERSION = "19.4.0"

drivers/txpy/txcql/connection.py

@@ -20,11 +20,12 @@ from thrift.transport import TTwisted
 from thrift.protocol import TBinaryProtocol
 from thrift.Thrift import TApplicationException
 from twisted.internet import defer, reactor
+from cassandra import Cassandra
+from cassandra.ttypes import Compression, InvalidRequestException, \
+			 CqlResultType, AuthenticationRequest, \
+			 SchemaDisagreementException
+
 try:
-    from cassandra import Cassandra
-    from cassandra.ttypes import Compression, InvalidRequestException, \
-                                 CqlResultType, AuthenticationRequest, \
-                                 SchemaDisagreementException
     from cql.errors import CQLException, InvalidCompressionScheme
     from cql.marshal import prepare
     from cql.decoders import SchemaDecoder
@@ -33,21 +34,10 @@ try:
 except ImportError:
     # Hack to run from a source tree
     import sys
-    sys.path.append(join(abspath(dirname(__file__)),
-                         '..',
-                         '..',
-                         '..',
-                         'interface',
-                         'thrift',
-                         'gen-py.twisted'))
     sys.path.append(join(abspath(dirname(__file__)),
                          '..',
                          '..',
                          'py'))
-    from cassandra import Cassandra
-    from cassandra.ttypes import Compression, InvalidRequestException, \
-                                 CqlResultType, AuthenticationRequest, \
-                                 SchemaDisagreementException
     from cql.errors import CQLException, InvalidCompressionScheme
     from cql.marshal import prepare
     from cql.decoders import SchemaDecoder