monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-22 04:45:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Msgpack 1.0.0 (fa7d744) → 1.0.4 (b5acfd5).

Browse source
This commit is contained in:
JackDandy 2023-01-12 18:48:11 +00:00
parent 12a8c41068
commit d252ca7d56
5 changed files with 152 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -3,6 +3,7 @@
* Update Cachecontrol 0.12.6 (167a605) to 0.12.11 (c05ef9e) * Update Cachecontrol 0.12.6 (167a605) to 0.12.11 (c05ef9e)
* Add Filelock 3.9.0 (ce3e891) * Add Filelock 3.9.0 (ce3e891)
* Remove Lockfile no longer used by Cachecontrol * Remove Lockfile no longer used by Cachecontrol
* Update Msgpack 1.0.0 (fa7d744) to 1.0.4 (b5acfd5)
[develop changelog] [develop changelog]

5
lib/msgpack/__init__.py
View file

@ -1,5 +1,4 @@
# coding: utf-8 # coding: utf-8
from ._version import version
from .exceptions import * from .exceptions import *
from .ext import ExtType, Timestamp from .ext import ExtType, Timestamp
@ -7,6 +6,10 @@ import os
import sys import sys
version = (1, 0, 4)
__version__ = "1.0.4"
if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2: if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2:
from .fallback import Packer, unpackb, Unpacker from .fallback import Packer, unpackb, Unpacker
else: else:

2
lib/msgpack/_version.py
View file

@ -1 +1 @@
version = (1, 0, 0) version = (1, 0, 4)

12
lib/msgpack/ext.py
View file

@ -59,7 +59,7 @@ class Timestamp(object):
raise TypeError("seconds must be an interger") raise TypeError("seconds must be an interger")
if not isinstance(nanoseconds, int_types): if not isinstance(nanoseconds, int_types):
raise TypeError("nanoseconds must be an integer") raise TypeError("nanoseconds must be an integer")
if not (0 <= nanoseconds < 10 ** 9): if not (0 <= nanoseconds < 10**9):
raise ValueError( raise ValueError(
"nanoseconds must be a non-negative integer less than 999999999." "nanoseconds must be a non-negative integer less than 999999999."
) )
@ -143,7 +143,7 @@ class Timestamp(object):
:type unix_float: int or float. :type unix_float: int or float.
""" """
seconds = int(unix_sec // 1) seconds = int(unix_sec // 1)
nanoseconds = int((unix_sec % 1) * 10 ** 9) nanoseconds = int((unix_sec % 1) * 10**9)
return Timestamp(seconds, nanoseconds) return Timestamp(seconds, nanoseconds)
def to_unix(self): def to_unix(self):
@ -161,7 +161,7 @@ class Timestamp(object):
:param int unix_ns: Posix timestamp in nanoseconds. :param int unix_ns: Posix timestamp in nanoseconds.
:rtype: Timestamp :rtype: Timestamp
""" """
return Timestamp(*divmod(unix_ns, 10 ** 9)) return Timestamp(*divmod(unix_ns, 10**9))
def to_unix_nano(self): def to_unix_nano(self):
"""Get the timestamp as a unixtime in nanoseconds. """Get the timestamp as a unixtime in nanoseconds.
@ -169,7 +169,7 @@ class Timestamp(object):
:returns: posix timestamp in nanoseconds :returns: posix timestamp in nanoseconds
:rtype: int :rtype: int
""" """
return self.seconds * 10 ** 9 + self.nanoseconds return self.seconds * 10**9 + self.nanoseconds
def to_datetime(self): def to_datetime(self):
"""Get the timestamp as a UTC datetime. """Get the timestamp as a UTC datetime.
@ -178,7 +178,9 @@ class Timestamp(object):
:rtype: datetime. :rtype: datetime.
""" """
return datetime.datetime.fromtimestamp(self.to_unix(), _utc) return datetime.datetime.fromtimestamp(0, _utc) + datetime.timedelta(
seconds=self.to_unix()
)
@staticmethod @staticmethod
def from_datetime(dt): def from_datetime(dt):

331
lib/msgpack/fallback.py
View file

@ -1,5 +1,4 @@
"""Fallback pure Python implementation of msgpack""" """Fallback pure Python implementation of msgpack"""
from datetime import datetime as _DateTime from datetime import datetime as _DateTime
import sys import sys
import struct import struct
@ -12,7 +11,6 @@ if PY2:
def dict_iteritems(d): def dict_iteritems(d):
return d.iteritems() return d.iteritems()
else: else:
int_types = int int_types = int
unicode = str unicode = str
@ -33,7 +31,6 @@ if sys.version_info < (3, 5):
and e.args[0].startswith("maximum recursion depth exceeded") and e.args[0].startswith("maximum recursion depth exceeded")
) )
else: else:
def _is_recursionerror(e): def _is_recursionerror(e):
@ -69,7 +66,6 @@ if hasattr(sys, "pypy_version_info"):
def getvalue(self): def getvalue(self):
return self.builder.build() return self.builder.build()
else: else:
USING_STRINGBUILDER = False USING_STRINGBUILDER = False
from io import BytesIO as StringIO from io import BytesIO as StringIO
@ -144,10 +140,41 @@ if sys.version_info < (2, 7, 6):
"""Explicit type cast for legacy struct.unpack_from""" """Explicit type cast for legacy struct.unpack_from"""
return struct.unpack_from(f, bytes(b), o) return struct.unpack_from(f, bytes(b), o)
else: else:
_unpack_from = struct.unpack_from _unpack_from = struct.unpack_from
_NO_FORMAT_USED = ""
_MSGPACK_HEADERS = {
0xC4: (1, _NO_FORMAT_USED, TYPE_BIN),
0xC5: (2, ">H", TYPE_BIN),
0xC6: (4, ">I", TYPE_BIN),
0xC7: (2, "Bb", TYPE_EXT),
0xC8: (3, ">Hb", TYPE_EXT),
0xC9: (5, ">Ib", TYPE_EXT),
0xCA: (4, ">f"),
0xCB: (8, ">d"),
0xCC: (1, _NO_FORMAT_USED),
0xCD: (2, ">H"),
0xCE: (4, ">I"),
0xCF: (8, ">Q"),
0xD0: (1, "b"),
0xD1: (2, ">h"),
0xD2: (4, ">i"),
0xD3: (8, ">q"),
0xD4: (1, "b1s", TYPE_EXT),
0xD5: (2, "b2s", TYPE_EXT),
0xD6: (4, "b4s", TYPE_EXT),
0xD7: (8, "b8s", TYPE_EXT),
0xD8: (16, "b16s", TYPE_EXT),
0xD9: (1, _NO_FORMAT_USED, TYPE_RAW),
0xDA: (2, ">H", TYPE_RAW),
0xDB: (4, ">I", TYPE_RAW),
0xDC: (2, ">H", TYPE_ARRAY),
0xDD: (4, ">I", TYPE_ARRAY),
0xDE: (2, ">H", TYPE_MAP),
0xDF: (4, ">I", TYPE_MAP),
}
class Unpacker(object): class Unpacker(object):
"""Streaming unpacker. """Streaming unpacker.
@ -229,7 +256,7 @@ class Unpacker(object):
Example of streaming deserialize from socket:: Example of streaming deserialize from socket::
unpacker = Unpacker(max_buffer_size) unpacker = Unpacker()
while True: while True:
buf = sock.recv(1024**2) buf = sock.recv(1024**2)
if not buf: if not buf:
@ -291,7 +318,7 @@ class Unpacker(object):
self._buf_checkpoint = 0 self._buf_checkpoint = 0
if not max_buffer_size: if not max_buffer_size:
max_buffer_size = 2 ** 31 - 1 max_buffer_size = 2**31 - 1
if max_str_len == -1: if max_str_len == -1:
max_str_len = max_buffer_size max_str_len = max_buffer_size
if max_bin_len == -1: if max_bin_len == -1:
@ -354,7 +381,7 @@ class Unpacker(object):
self._buffer.extend(view) self._buffer.extend(view)
def _consume(self): def _consume(self):
""" Gets rid of the used parts of the buffer. """ """Gets rid of the used parts of the buffer."""
self._stream_offset += self._buff_i - self._buf_checkpoint self._stream_offset += self._buff_i - self._buf_checkpoint
self._buf_checkpoint = self._buff_i self._buf_checkpoint = self._buff_i
@ -365,18 +392,19 @@ class Unpacker(object):
return self._buffer[self._buff_i :] return self._buffer[self._buff_i :]
def read_bytes(self, n): def read_bytes(self, n):
ret = self._read(n) ret = self._read(n, raise_outofdata=False)
self._consume() self._consume()
return ret return ret
def _read(self, n): def _read(self, n, raise_outofdata=True):
# (int) -> bytearray # (int) -> bytearray
self._reserve(n) self._reserve(n, raise_outofdata=raise_outofdata)
i = self._buff_i i = self._buff_i
self._buff_i = i + n ret = self._buffer[i : i + n]
return self._buffer[i : i + n] self._buff_i = i + len(ret)
return ret
def _reserve(self, n): def _reserve(self, n, raise_outofdata=True):
remain_bytes = len(self._buffer) - self._buff_i - n remain_bytes = len(self._buffer) - self._buff_i - n
# Fast path: buffer has n bytes already # Fast path: buffer has n bytes already
@ -395,6 +423,8 @@ class Unpacker(object):
# Read from file # Read from file
remain_bytes = -remain_bytes remain_bytes = -remain_bytes
if remain_bytes + len(self._buffer) > self._max_buffer_size:
raise BufferFull
while remain_bytes > 0: while remain_bytes > 0:
to_read_bytes = max(self._read_size, remain_bytes) to_read_bytes = max(self._read_size, remain_bytes)
read_data = self.file_like.read(to_read_bytes) read_data = self.file_like.read(to_read_bytes)
@ -404,11 +434,11 @@ class Unpacker(object):
self._buffer += read_data self._buffer += read_data
remain_bytes -= len(read_data) remain_bytes -= len(read_data)
if len(self._buffer) < n + self._buff_i: if len(self._buffer) < n + self._buff_i and raise_outofdata:
self._buff_i = 0 # rollback self._buff_i = 0 # rollback
raise OutOfData raise OutOfData
def _read_header(self, execute=EX_CONSTRUCT): def _read_header(self):
typ = TYPE_IMMEDIATE typ = TYPE_IMMEDIATE
n = 0 n = 0
obj = None obj = None
@ -423,205 +453,95 @@ class Unpacker(object):
n = b & 0b00011111 n = b & 0b00011111
typ = TYPE_RAW typ = TYPE_RAW
if n > self._max_str_len: if n > self._max_str_len:
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len) raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
obj = self._read(n) obj = self._read(n)
elif b & 0b11110000 == 0b10010000: elif b & 0b11110000 == 0b10010000:
n = b & 0b00001111 n = b & 0b00001111
typ = TYPE_ARRAY typ = TYPE_ARRAY
if n > self._max_array_len: if n > self._max_array_len:
raise ValueError("%s exceeds max_array_len(%s)", n, self._max_array_len) raise ValueError(
"%s exceeds max_array_len(%s)" % (n, self._max_array_len)
)
elif b & 0b11110000 == 0b10000000: elif b & 0b11110000 == 0b10000000:
n = b & 0b00001111 n = b & 0b00001111
typ = TYPE_MAP typ = TYPE_MAP
if n > self._max_map_len: if n > self._max_map_len:
raise ValueError("%s exceeds max_map_len(%s)", n, self._max_map_len) raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
elif b == 0xC0: elif b == 0xC0:
obj = None obj = None
elif b == 0xC2: elif b == 0xC2:
obj = False obj = False
elif b == 0xC3: elif b == 0xC3:
obj = True obj = True
elif b == 0xC4: elif 0xC4 <= b <= 0xC6:
typ = TYPE_BIN size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(1) self._reserve(size)
n = self._buffer[self._buff_i] if len(fmt) > 0:
self._buff_i += 1 n = _unpack_from(fmt, self._buffer, self._buff_i)[0]
else:
n = self._buffer[self._buff_i]
self._buff_i += size
if n > self._max_bin_len: if n > self._max_bin_len:
raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len)) raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
obj = self._read(n) obj = self._read(n)
elif b == 0xC5: elif 0xC7 <= b <= 0xC9:
typ = TYPE_BIN size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(2) self._reserve(size)
n = _unpack_from(">H", self._buffer, self._buff_i)[0] L, n = _unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += 2 self._buff_i += size
if n > self._max_bin_len:
raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
obj = self._read(n)
elif b == 0xC6:
typ = TYPE_BIN
self._reserve(4)
n = _unpack_from(">I", self._buffer, self._buff_i)[0]
self._buff_i += 4
if n > self._max_bin_len:
raise ValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
obj = self._read(n)
elif b == 0xC7: # ext 8
typ = TYPE_EXT
self._reserve(2)
L, n = _unpack_from("Bb", self._buffer, self._buff_i)
self._buff_i += 2
if L > self._max_ext_len: if L > self._max_ext_len:
raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len)) raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
obj = self._read(L) obj = self._read(L)
elif b == 0xC8: # ext 16 elif 0xCA <= b <= 0xD3:
typ = TYPE_EXT size, fmt = _MSGPACK_HEADERS[b]
self._reserve(3) self._reserve(size)
L, n = _unpack_from(">Hb", self._buffer, self._buff_i) if len(fmt) > 0:
self._buff_i += 3 obj = _unpack_from(fmt, self._buffer, self._buff_i)[0]
if L > self._max_ext_len: else:
raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len)) obj = self._buffer[self._buff_i]
obj = self._read(L) self._buff_i += size
elif b == 0xC9: # ext 32 elif 0xD4 <= b <= 0xD8:
typ = TYPE_EXT size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(5) if self._max_ext_len < size:
L, n = _unpack_from(">Ib", self._buffer, self._buff_i) raise ValueError(
self._buff_i += 5 "%s exceeds max_ext_len(%s)" % (size, self._max_ext_len)
if L > self._max_ext_len: )
raise ValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len)) self._reserve(size + 1)
obj = self._read(L) n, obj = _unpack_from(fmt, self._buffer, self._buff_i)
elif b == 0xCA: self._buff_i += size + 1
self._reserve(4) elif 0xD9 <= b <= 0xDB:
obj = _unpack_from(">f", self._buffer, self._buff_i)[0] size, fmt, typ = _MSGPACK_HEADERS[b]
self._buff_i += 4 self._reserve(size)
elif b == 0xCB: if len(fmt) > 0:
self._reserve(8) (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
obj = _unpack_from(">d", self._buffer, self._buff_i)[0] else:
self._buff_i += 8 n = self._buffer[self._buff_i]
elif b == 0xCC: self._buff_i += size
self._reserve(1)
obj = self._buffer[self._buff_i]
self._buff_i += 1
elif b == 0xCD:
self._reserve(2)
obj = _unpack_from(">H", self._buffer, self._buff_i)[0]
self._buff_i += 2
elif b == 0xCE:
self._reserve(4)
obj = _unpack_from(">I", self._buffer, self._buff_i)[0]
self._buff_i += 4
elif b == 0xCF:
self._reserve(8)
obj = _unpack_from(">Q", self._buffer, self._buff_i)[0]
self._buff_i += 8
elif b == 0xD0:
self._reserve(1)
obj = _unpack_from("b", self._buffer, self._buff_i)[0]
self._buff_i += 1
elif b == 0xD1:
self._reserve(2)
obj = _unpack_from(">h", self._buffer, self._buff_i)[0]
self._buff_i += 2
elif b == 0xD2:
self._reserve(4)
obj = _unpack_from(">i", self._buffer, self._buff_i)[0]
self._buff_i += 4
elif b == 0xD3:
self._reserve(8)
obj = _unpack_from(">q", self._buffer, self._buff_i)[0]
self._buff_i += 8
elif b == 0xD4: # fixext 1
typ = TYPE_EXT
if self._max_ext_len < 1:
raise ValueError("%s exceeds max_ext_len(%s)" % (1, self._max_ext_len))
self._reserve(2)
n, obj = _unpack_from("b1s", self._buffer, self._buff_i)
self._buff_i += 2
elif b == 0xD5: # fixext 2
typ = TYPE_EXT
if self._max_ext_len < 2:
raise ValueError("%s exceeds max_ext_len(%s)" % (2, self._max_ext_len))
self._reserve(3)
n, obj = _unpack_from("b2s", self._buffer, self._buff_i)
self._buff_i += 3
elif b == 0xD6: # fixext 4
typ = TYPE_EXT
if self._max_ext_len < 4:
raise ValueError("%s exceeds max_ext_len(%s)" % (4, self._max_ext_len))
self._reserve(5)
n, obj = _unpack_from("b4s", self._buffer, self._buff_i)
self._buff_i += 5
elif b == 0xD7: # fixext 8
typ = TYPE_EXT
if self._max_ext_len < 8:
raise ValueError("%s exceeds max_ext_len(%s)" % (8, self._max_ext_len))
self._reserve(9)
n, obj = _unpack_from("b8s", self._buffer, self._buff_i)
self._buff_i += 9
elif b == 0xD8: # fixext 16
typ = TYPE_EXT
if self._max_ext_len < 16:
raise ValueError("%s exceeds max_ext_len(%s)" % (16, self._max_ext_len))
self._reserve(17)
n, obj = _unpack_from("b16s", self._buffer, self._buff_i)
self._buff_i += 17
elif b == 0xD9:
typ = TYPE_RAW
self._reserve(1)
n = self._buffer[self._buff_i]
self._buff_i += 1
if n > self._max_str_len: if n > self._max_str_len:
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len) raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
obj = self._read(n) obj = self._read(n)
elif b == 0xDA: elif 0xDC <= b <= 0xDD:
typ = TYPE_RAW size, fmt, typ = _MSGPACK_HEADERS[b]
self._reserve(2) self._reserve(size)
(n,) = _unpack_from(">H", self._buffer, self._buff_i) (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
self._buff_i += 2 self._buff_i += size
if n > self._max_str_len:
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
obj = self._read(n)
elif b == 0xDB:
typ = TYPE_RAW
self._reserve(4)
(n,) = _unpack_from(">I", self._buffer, self._buff_i)
self._buff_i += 4
if n > self._max_str_len:
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
obj = self._read(n)
elif b == 0xDC:
typ = TYPE_ARRAY
self._reserve(2)
(n,) = _unpack_from(">H", self._buffer, self._buff_i)
self._buff_i += 2
if n > self._max_array_len: if n > self._max_array_len:
raise ValueError("%s exceeds max_array_len(%s)", n, self._max_array_len) raise ValueError(
elif b == 0xDD: "%s exceeds max_array_len(%s)" % (n, self._max_array_len)
typ = TYPE_ARRAY )
self._reserve(4) elif 0xDE <= b <= 0xDF:
(n,) = _unpack_from(">I", self._buffer, self._buff_i) size, fmt, typ = _MSGPACK_HEADERS[b]
self._buff_i += 4 self._reserve(size)
if n > self._max_array_len: (n,) = _unpack_from(fmt, self._buffer, self._buff_i)
raise ValueError("%s exceeds max_array_len(%s)", n, self._max_array_len) self._buff_i += size
elif b == 0xDE:
self._reserve(2)
(n,) = _unpack_from(">H", self._buffer, self._buff_i)
self._buff_i += 2
if n > self._max_map_len: if n > self._max_map_len:
raise ValueError("%s exceeds max_map_len(%s)", n, self._max_map_len) raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
typ = TYPE_MAP
elif b == 0xDF:
self._reserve(4)
(n,) = _unpack_from(">I", self._buffer, self._buff_i)
self._buff_i += 4
if n > self._max_map_len:
raise ValueError("%s exceeds max_map_len(%s)", n, self._max_map_len)
typ = TYPE_MAP
else: else:
raise FormatError("Unknown header: 0x%x" % b) raise FormatError("Unknown header: 0x%x" % b)
return typ, n, obj return typ, n, obj
def _unpack(self, execute=EX_CONSTRUCT): def _unpack(self, execute=EX_CONSTRUCT):
typ, n, obj = self._read_header(execute) typ, n, obj = self._read_header()
if execute == EX_READ_ARRAY_HEADER: if execute == EX_READ_ARRAY_HEADER:
if typ != TYPE_ARRAY: if typ != TYPE_ARRAY:
@ -743,7 +663,7 @@ class Packer(object):
""" """
MessagePack Packer MessagePack Packer
Usage: Usage::
packer = Packer() packer = Packer()
astream.write(packer.pack(a)) astream.write(packer.pack(a))
@ -783,6 +703,29 @@ class Packer(object):
:param str unicode_errors: :param str unicode_errors:
The error handler for encoding unicode. (default: 'strict') The error handler for encoding unicode. (default: 'strict')
DO NOT USE THIS!! This option is kept for very specific usage. DO NOT USE THIS!! This option is kept for very specific usage.
Example of streaming deserialize from file-like object::
unpacker = Unpacker(file_like)
for o in unpacker:
process(o)
Example of streaming deserialize from socket::
unpacker = Unpacker()
while True:
buf = sock.recv(1024**2)
if not buf:
break
unpacker.feed(buf)
for o in unpacker:
process(o)
Raises ``ExtraData`` when *packed* contains extra bytes.
Raises ``OutOfData`` when *packed* is incomplete.
Raises ``FormatError`` when *packed* is not valid msgpack.
Raises ``StackError`` when *packed* contains too nested.
Other exceptions can be raised during unpacking.
""" """
def __init__( def __init__(
@ -859,20 +802,20 @@ class Packer(object):
raise OverflowError("Integer value out of range") raise OverflowError("Integer value out of range")
if check(obj, (bytes, bytearray)): if check(obj, (bytes, bytearray)):
n = len(obj) n = len(obj)
if n >= 2 ** 32: if n >= 2**32:
raise ValueError("%s is too large" % type(obj).__name__) raise ValueError("%s is too large" % type(obj).__name__)
self._pack_bin_header(n) self._pack_bin_header(n)
return self._buffer.write(obj) return self._buffer.write(obj)
if check(obj, unicode): if check(obj, unicode):
obj = obj.encode("utf-8", self._unicode_errors) obj = obj.encode("utf-8", self._unicode_errors)
n = len(obj) n = len(obj)
if n >= 2 ** 32: if n >= 2**32:
raise ValueError("String is too large") raise ValueError("String is too large")
self._pack_raw_header(n) self._pack_raw_header(n)
return self._buffer.write(obj) return self._buffer.write(obj)
if check(obj, memoryview): if check(obj, memoryview):
n = len(obj) * obj.itemsize n = len(obj) * obj.itemsize
if n >= 2 ** 32: if n >= 2**32:
raise ValueError("Memoryview is too large") raise ValueError("Memoryview is too large")
self._pack_bin_header(n) self._pack_bin_header(n)
return self._buffer.write(obj) return self._buffer.write(obj)
@ -920,7 +863,7 @@ class Packer(object):
len(obj), dict_iteritems(obj), nest_limit - 1 len(obj), dict_iteritems(obj), nest_limit - 1
) )
if self._datetime and check(obj, _DateTime): if self._datetime and check(obj, _DateTime) and obj.tzinfo is not None:
obj = Timestamp.from_datetime(obj) obj = Timestamp.from_datetime(obj)
default_used = 1 default_used = 1
continue continue
@ -929,6 +872,10 @@ class Packer(object):
obj = self._default(obj) obj = self._default(obj)
default_used = 1 default_used = 1
continue continue
if self._datetime and check(obj, _DateTime):
raise ValueError("Cannot serialize %r where tzinfo=None" % (obj,))
raise TypeError("Cannot serialize %r" % (obj,)) raise TypeError("Cannot serialize %r" % (obj,))
def pack(self, obj): def pack(self, obj):
@ -950,7 +897,7 @@ class Packer(object):
return ret return ret
def pack_array_header(self, n): def pack_array_header(self, n):
if n >= 2 ** 32: if n >= 2**32:
raise ValueError raise ValueError
self._pack_array_header(n) self._pack_array_header(n)
if self._autoreset: if self._autoreset:
@ -959,7 +906,7 @@ class Packer(object):
return ret return ret
def pack_map_header(self, n): def pack_map_header(self, n):
if n >= 2 ** 32: if n >= 2**32:
raise ValueError raise ValueError
self._pack_map_header(n) self._pack_map_header(n)
if self._autoreset: if self._autoreset: