24 Commits

Author SHA1 Message Date
gecong1973
1df76ee42d Replace six.iteritems() with .items()
1.As mentioned in [1], we should avoid using
six.iteritems to achieve iterators. We can use
dict.items instead, as it will return iterators
in PY3 as well. And dict.items/keys will more readable.
2.In py2, the performance about list should be negligible,
see the link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Change-Id: Ifbe7929580ec61a2cd50232794c0cbd0cbf37edc
2016-12-12 11:11:28 +08:00
Gevorg Davoian
a73120aad6 Fix serialization of binary strings in Python3
Change-Id: I30e7c7b7cb2356a39bc51eb8c93f14c8881a38c2
Closes-Bug: #1599387
2016-08-01 16:58:08 +03:00
Edan David
1ec85e90cd Use {} instead of dict()
There is a performance impact when using dict() instead of {}
in CPython (up to 6 times longer).
Considering the to_primitive function is recursive this can
have quite an effect.

Measuring:
$ python2.7 -m timeit -n 1000000 -r 5 -v 'dict()'
raw times: 0.24 0.24 0.24 0.239 0.24
1000000 loops, best of 5: 0.239 usec per loop

$ python2.7 -m timeit -n 1000000 -r 5 -v '{}'
raw times: 0.0417 0.0413 0.0407 0.0411 0.042
1000000 loops, best of 5: 0.0407 usec per loop

For more information:
https://doughellmann.com/blog/2012/11/12/
the-performance-impact-of-using-dict-instead-of-in-cpython-2-7-2/

Change-Id: Ia0b5892773a19cbabe40313a3bc788580a943f53
2016-06-21 10:58:06 -04:00
Jenkins
0aa1638408 Merge "Support serializing ipaddress objs with jsonutils" 2016-06-09 08:18:25 +00:00
Gevorg Davoian
4fdaeff758 Replace TypeError by ValueError in msgpackutils
There are some differences in the behaviour of json and msgpack
serializers. Msgpack throws TypeError when it doesn't know
how to handle an object. Json throws ValueError instead. Regarding
the fact that serialization should be configurable (in particular,
serializers should have similar behaviour; right now transition from
json to msgpack leads to errors and fails) this patch proposes to
raise ValueError instead of TypeError on failures so that libraries
already using jsonutils would be able to also work with msgpackutils.

Change-Id: I3d21b7d136e5a426a3c4a70a953c82ddcd6ef5af
2016-06-08 08:41:36 +00:00
Jim Baker
8943c73662 Support serializing ipaddress objs with jsonutils
Fixes jsonutils.to_primitive so that it can serialize ipaddress
objects, as used by Python 3 or through the backport in
global-requirements.txt. Current support for netaddr is maintained.

Change-Id: I6aa1ecd5be754f61cdda4e47bc0e0180e232b366
Closes-bug: 1590076
2016-06-07 14:05:50 -06:00
Ian Cordasco
29a7702a99 Remove fallback to simplejson in jsonutils
OpenStack has ended support for Python 2.6 in all services and
libraries. We no longer need to support a fallback to simplejson on
Python 2.6 so we can remove this fallback logic.

Closes-bug: 1533337
Change-Id: I613541a37229ff2f3ce269cfa7496223d1ff37d0
2016-01-12 13:53:47 -06:00
Victor Stinner
2d085d2c17 Use versionadded and versionchanged in doc
Document in which version new types and functions were added using
".. versionadded:: x.y". Document changes using
".. versionchanged:: x.y."

For base64 module, add the versionadded tag in the module top
docstring, not on each type/function.

I used "git blame" + "git tag --contains=SHA1" to find these version,
and then I checked manually each version.

Change-Id: I4a891b18064fe7b857a79c57030ff31f7a0370b4
2015-10-15 14:38:50 +02:00
Sirushti Murugesan
96886ce299 Also check for the existence of items in to_primitive()
Change-Id: If4636566a642ddf2e6e13cc014abca4ad68d1977
2015-09-30 12:37:12 +05:30
Victor Stinner
92f2111b26 Add jsonutils.dump_as_bytes() function for py3
The jsonutils.dumps() function returns bytes on Python 2 and Unicode
oon Python 3. In some cases, we always want bytes. For example, a
HTTP body must be bytes. This function avoids an condition call to
.encode() depending on the type or on the Python version.

For example:

    body = jsonutils.dumps(data)
    if isinstance(body, six.text_type):
        body = body.encode('utf-8')

can be replaced with:

    body = jsonutils.dump_as_bytes(data)

Change-Id: Ib9d8f1309982762b54d8a91b1f24f64d0ae6723a
2015-09-23 15:23:43 +02:00
Brant Knudson
57364659c1 Stop using deprecated oslo_utils.timeutils.strtime
oslo_utils.timeutils.strtime is deprecated, so stop using it.

Change-Id: I5a6c54b99820174f50f716deae275c0114632b2d
2015-06-30 08:26:18 -05:00
Davanum Srinivas (dims)
15c82cc902 Revert "jsonutils: replace strtime() usage with isoformat()"
This is a wire format change that the projects are not ready for yet (example Nova).

We should do this as part of a major version bump (2.x) with ample time for folks to move up.

Nova review to prepare the Nova code base for this change:
Ib7e60ed94edd1eb409baf8c29c61237d85944787

This reverts commit 5b0827a3df584b3e26bb44e5358cc28ac4a91636.

Change-Id: Ic4bf047b40c1dad2f8d2bc0afda934e47dba1f9d
2015-06-01 15:43:37 -04:00
Julien Danjou
986ec5832e jsonutils: encode dict keys
Currently, only the dict value are converted with to_primitive().
There's no reason not to do it on keys too to support special types.

Change-Id: I5b447f2fcd814088483f67e54261131cfc87ae79
2015-05-13 12:11:21 +02:00
Julien Danjou
50e1abcb97 jsonutils: simplify simple value handling
There's a few code duplications because for some reason the code
handling the recursive part got some conversion code for non-recursive
value.

Let's stack non-recursive value conversion as the top, and then use
"recursive" only where needed.

Change-Id: Ic1ecc76aba5402129a936dfb4649df0806a564a4
2015-05-13 12:11:21 +02:00
Julien Danjou
5b0827a3df jsonutils: replace strtime() usage with isoformat()
Following discussion in change I8b5119e64369ccac3423dccc04421f99912df733
in oslo.utils, we plan to deprecated and remove strtime() which is to be
considered dangerous.

This changes the json serialization code to embed the timezone in the
encoded datetime string if it's available.

Change-Id: I262391987d25b483d2bec4ac3abe94b6e9d032ad
2015-05-13 12:11:12 +02:00
Joshua Harlow
4ada51b09d More docstring cleanups/tweaks
Ensure jsonutils and msgpackutils headers are linkable and
connect into there associated functions and classes so that
clicking on links works (instead of not working).

Change-Id: Ifa28421e7d21a85290ee13d04918325c3f991b92
2015-04-14 21:09:14 +00:00
Jenkins
530fea24cc Merge "jsonutils: add set() tests and simplify recursive code" 2015-02-16 18:29:01 +00:00
Jenkins
4bfc83e0b0 Merge "jsonutils: support UUID encoding" 2015-02-16 18:28:59 +00:00
Jenkins
f04e859855 Merge "Use default in dumps()" 2015-02-16 18:28:39 +00:00
Julien Danjou
22cea10c38 jsonutils: add set() tests and simplify recursive code
Change-Id: I6fd3a78d2caee2e4891d00530350407d407ff677
2015-02-05 21:04:26 +01:00
Julien Danjou
73f7155af2 jsonutils: support UUID encoding
Change-Id: I2c864f793b4ee6136442b678380bf21f732be643
2015-02-05 21:04:26 +01:00
Julien Danjou
2c244b288e Use default in dumps()
There's a different behaviour currently between dump() and dumps() as by
default dumps() use the to_primitive function provided by this module,
and dump() does not. This patch fixes that.

Change-Id: I8a116e3777901bc713e9812c1a654a51b43e702a
2015-02-05 21:04:25 +01:00
Doug Hellmann
402abdbcd0 Update Oslo imports to remove namespace package
Change-Id: I4ec9b2a310471e4e07867073e9577731ac34027d
Blueprint: drop-namespace-packages
2015-01-21 19:54:33 -05:00
Doug Hellmann
e8deb08b7f Move files out of the namespace package
Move the public API out of oslo.serialization to
oslo_serialization. Retain the ability to import from the old namespace
package for backwards compatibility for this release cycle.

bp/drop-namespace-packages

Change-Id: Ic60f809ea00ac77b0753556c6fd00b97e64d57ff
2015-01-05 15:40:06 -05:00