Made bundled thrift-gen a subpackage of pycassa.

Installing via setup.py should now work. Pycassa will now always use its bundled thrift-gen code, so having other thrift-generated cassandra packages on the path should have no effect.
pycassa · Sep 2, 2010 · 77f1fc0 · 77f1fc0
1 parent fc796dc
commit 77f1fc0
Show file tree

Hide file tree

Showing 15 changed files with 8,107 additions and 8,118 deletions.
diff --git a/pycassa/__init__.py b/pycassa/__init__.py
@@ -4,5 +4,6 @@
 from pycassa.connection import *
 from pycassa.index import *
 
-from cassandra.ttypes import ConsistencyLevel, InvalidRequestException, \
-    NotFoundException, UnavailableException, TimedOutException
+from pycassa.cassandra.ttypes import ConsistencyLevel,\
+    InvalidRequestException, NotFoundException, UnavailableException,\
+    TimedOutException
diff --git a/pycassa/batch.py b/pycassa/batch.py
@@ -1,6 +1,7 @@
 import threading
-from cassandra.ttypes import (Clock, Column, ColumnOrSuperColumn, ConsistencyLevel,
-                              Deletion, Mutation, SlicePredicate, SuperColumn)
+from pycassa.cassandra.ttypes import (Clock, Column, ColumnOrSuperColumn,
+                                      ConsistencyLevel, Deletion, Mutation,
+                                      SlicePredicate, SuperColumn)
 
 
 class Mutator(object):