You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2011/03/16 20:36:48 UTC
svn commit: r1082273 [5/5] - in /cassandra/trunk/drivers/txpy: setup.py
txcql/cassandra/ txcql/cassandra/Cassandra.py txcql/cassandra/__init__.py
txcql/cassandra/constants.py txcql/cassandra/ttypes.py txcql/connection.py
Modified: cassandra/trunk/drivers/txpy/txcql/connection.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/txpy/txcql/connection.py?rev=1082273&r1=1082272&r2=1082273&view=diff
==============================================================================
--- cassandra/trunk/drivers/txpy/txcql/connection.py (original)
+++ cassandra/trunk/drivers/txpy/txcql/connection.py Wed Mar 16 19:36:47 2011
@@ -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
@@ -36,18 +37,7 @@ except ImportError:
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