Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pycassa/pycassa
base: master
...
head fork: f0rk/pycassa
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 2 commit comments
  • 1 contributor
Showing with 10 additions and 3 deletions.
  1. +2 −2 debian/rules
  2. +8 −1 pycassa/marshal.py
View
4 debian/rules
@@ -9,8 +9,8 @@ override_dh_auto_build:
override_dh_install:
dh_install
- rm debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/static/jquery.js
- ln -s /usr/share/javascript/jquery/jquery.js debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/static/
+ rm debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/_static/jquery.js
+ ln -s /usr/share/javascript/jquery/jquery.js debian/pycassa-doc/usr/share/doc/pycassa-doc/manual/_static/
override_dh_auto_install:
dh_auto_install -ppython-pycassa --destdir=debian/python-pycassa
View
9 pycassa/marshal.py
@@ -29,6 +29,7 @@ def unpack(self, v):
_bool_packer = make_packer('>B')
_float_packer = make_packer('>f')
_double_packer = make_packer('>d')
+_decimal_packer = make_packer('>d')
_long_packer = make_packer('>q')
_int_packer = make_packer('>i')
_short_packer = make_packer('>H')
@@ -36,7 +37,8 @@ def unpack(self, v):
_BASIC_TYPES = ['BytesType', 'LongType', 'IntegerType', 'UTF8Type',
'AsciiType', 'LexicalUUIDType', 'TimeUUIDType',
'CounterColumnType', 'FloatType', 'DoubleType',
- 'DateType', 'BooleanType', 'UUIDType', 'Int32Type']
+ 'DateType', 'BooleanType', 'UUIDType', 'Int32Type',
+ 'DecimalType']
def extract_type_name(typestr):
if typestr is None:
@@ -176,6 +178,11 @@ def pack_double(v, _=None):
return _double_packer.pack(v)
return pack_double
+ elif data_type == 'DecimalType':
+ def pack_decimal(v, _=None):
+ return _decimal_packer.pack(v)
+ return pack_decimal
+
elif data_type == 'FloatType':
def pack_float(v, _=None):
return _float_packer.pack(v)

Showing you all comments on commits in this comparison.

@hannosch
Owner

did you want to leave that print statement?

@f0rk

Absolutely not.

Something went wrong with that request. Please try again.