diff options
| author | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2015-11-23 20:48:30 +0800 |
|---|---|---|
| committer | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2015-11-24 11:16:20 +0800 |
| commit | 90da40f425a15730d1207495e8dc77bbac5edee7 (patch) | |
| tree | 1a6048a7808d791b36a198ccc5ab20ac3da33c5c | |
| parent | ba7c9eb70682d6c131a4525b19a3fbbd6f4067b8 (diff) | |
| download | oslo-middleware-90da40f425a15730d1207495e8dc77bbac5edee7.tar.gz | |
Drop python 2.6 support
Change-Id: Id5de889fb3aaa3905400dab8cc03c3240ca67a83
| -rw-r--r-- | oslo_middleware/healthcheck/__init__.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/oslo_middleware/healthcheck/__init__.py b/oslo_middleware/healthcheck/__init__.py index ceb2301..a821233 100644 --- a/oslo_middleware/healthcheck/__init__.py +++ b/oslo_middleware/healthcheck/__init__.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import collections import gc import json import platform @@ -20,12 +21,6 @@ import socket import sys import traceback -try: - from collections import OrderedDict # noqa -except ImportError: - # TODO(harlowja): remove this when py2.6 support is dropped... - from ordereddict import OrderedDict # noqa - import jinja2 from oslo_utils import reflection from oslo_utils import strutils @@ -238,7 +233,7 @@ Reason self.NAMESPACE, self._backend_names, name_order=True, invoke_on_load=True, invoke_args=(conf,)) - self._accept_to_functor = OrderedDict([ + self._accept_to_functor = collections.OrderedDict([ # Order here matters... ('text/plain', self._make_text_response), ('text/html', self._make_html_response), |