cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r1082271 [5/5] - in /cassandra/trunk/drivers/py: cql/cassandra/ cql/cassandra/Cassandra.py cql/cassandra/__init__.py cql/cassandra/constants.py cql/cassandra/ttypes.py cql/connection.py setup.py
Date Wed, 16 Mar 2011 19:36:35 GMT
Modified: cassandra/trunk/drivers/py/cql/connection.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/connection.py?rev=1082271&r1=1082270&r2=1082271&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/connection.py (original)
+++ cassandra/trunk/drivers/py/cql/connection.py Wed Mar 16 19:36:35 2011
@@ -25,25 +25,10 @@ from decoders import SchemaDecoder
 from results import RowsProxy
 import zlib, re
 
-try:
-    from cassandra import Cassandra
-    from cassandra.ttypes import Compression, InvalidRequestException, \
-                                 CqlResultType, AuthenticationRequest, \
-                                 SchemaDisagreementException
-except ImportError:
-    # Hack to run from a source tree
-    import sys
-    sys.path.append(join(abspath(dirname(__file__)),
-                         '..',
-                         '..',
-                         '..',
-                         'interface',
-                         'thrift',
-                         'gen-py'))
-    from cassandra import Cassandra
-    from cassandra.ttypes import Compression, InvalidRequestException, \
-                                 CqlResultType, AuthenticationRequest, \
-                                 SchemaDisagreementException
+from cassandra import Cassandra
+from cassandra.ttypes import Compression, InvalidRequestException, \
+                             CqlResultType, AuthenticationRequest, \
+                             SchemaDisagreementException
     
 COMPRESSION_SCHEMES = ['GZIP']
 DEFAULT_COMPRESSION = 'GZIP'

Modified: cassandra/trunk/drivers/py/setup.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/setup.py?rev=1082271&r1=1082270&r2=1082271&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/setup.py (original)
+++ cassandra/trunk/drivers/py/setup.py Wed Mar 16 19:36:35 2011
@@ -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=["cql"],
+    packages=["cql", "cql.cassandra"],
     scripts=["cqlsh"],
     requires=["thrift"],
     provides=["cql"],



Mime
View raw message