x/deb-oslo.middleware
Code Issues Proposed changes

Drop python 2.6 support

Browse Source 
Change-Id: Id5de889fb3aaa3905400dab8cc03c3240ca67a83
This commit is contained in:
ChangBo Guo(gcb) 2015-11-23 20:48:30 +08:00
parent ba7c9eb706
commit 90da40f425
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oslo_middleware/healthcheck/__init__.py
View File

@ -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),