Remove compatibility fixes for python 2.6

As soon as CentOS7 gets merged we should remove
all compatibility fixes from fuel-web

Change-Id: I51d8f9f71fcef6efa3b1acfe3fdf358820af8de7
Closes-Bug: #1521592

nailgun/manage.py

@@ -191,10 +191,7 @@ def action_dumpdata(params):
 
 
 def action_generate_nodes_fixture(params):
-    try:
-        from oslo.serialization import jsonutils
-    except ImportError:
-        from oslo_serialization import jsonutils
+    from oslo_serialization import jsonutils
     from nailgun.logger import logger
     from nailgun.utils import fake_generator
 

nailgun/nailgun/orchestrator/neutron_serializers.py

@@ -17,11 +17,8 @@
 """Neutron network deployment serializers for orchestrator"""
 
 from collections import defaultdict
+from collections import OrderedDict
 import netaddr
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
 import re
 import six
 

nailgun/setup.py

@@ -14,7 +14,6 @@
 
 import os
 import os.path
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
@@ -28,9 +27,6 @@ def find_requires():
     requirements = []
     with open('{0}/requirements.txt'.format(dir_path), 'r') as reqs:
         requirements = reqs.readlines()
-    if sys.version_info == (2, 6):
-        requirements.append('argparse')
-        requirements.append('ordereddict')
     return requirements
 
 

specs/fuel-nailgun.spec

@@ -58,11 +58,6 @@ Requires:    pydot-ng >= 1.0.0
 # Workaroud for babel bug
 Requires:    pytz
 
-%if 0%{?rhel} >= 5 && 0%{?rhel} < 7
-Requires:    python-argparse >= 1.2.1
-Requires:    python-ordereddict >= 1.1
-%endif
-
 %if 0%{?fedora} > 16 || 0%{?rhel} > 6
 Requires(post): systemd-units
 Requires(preun): systemd-units