diff options
| author | Adam Cozzette <acozzette@google.com> | 2016-11-17 16:48:38 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 16:59:59 -0800 |
| commit | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (patch) | |
| tree | 0276f81f8848a05d84cd7e287b43d665e30f04e3 /python/google/protobuf/json_format.py | |
| parent | e28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff) | |
| download | protobuf-5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74.tar.gz protobuf-5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74.tar.bz2 protobuf-5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74.zip | |
Integrated internal changes from Google
Diffstat (limited to 'python/google/protobuf/json_format.py')
| -rw-r--r-- | python/google/protobuf/json_format.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/google/protobuf/json_format.py b/python/google/protobuf/json_format.py index c42371d0..d02cb091 100644 --- a/python/google/protobuf/json_format.py +++ b/python/google/protobuf/json_format.py @@ -43,9 +43,9 @@ Simple usage example: __author__ = 'jieluo@google.com (Jie Luo)' try: - from collections import OrderedDict + from collections import OrderedDict except ImportError: - from ordereddict import OrderedDict #PY26 + from ordereddict import OrderedDict #PY26 import base64 import json import math |