Permalink
Browse files

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.
  • Loading branch information...
thobbs committed Sep 2, 2010
1 parent fc796dc commit 77f1fc023ca737afdadf14b84cb8af794a39a8dc
View
@@ -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
View
@@ -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):
Oops, something went wrong.

0 comments on commit 77f1fc0

Please sign in to comment.