Remove ordereddict as 2.6 is no longer supported

ordereddict, and a related workaround method, were removed as we no
longer support python 2.6. Collections contains ordereddict on newer
python versions.

Change-Id: I48cc55a5c56fbc1f71442fc858eb4905f0213988
This commit is contained in:
Jay Faulkner
2015-09-03 13:15:55 -07:00
parent bc98593416
commit d29b9af748
3 changed files with 2 additions and 13 deletions
ironic_python_agent
extensions
utils.py
requirements.txt

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import collections
import copy
import glob
import os
@ -46,15 +45,6 @@ SUPPORTED_ROOT_DEVICE_HINTS = set(('size', 'model', 'wwn', 'serial', 'vendor'))
AGENT_PARAMS_CACHED = dict()
def get_ordereddict(*args, **kwargs):
"""A fix for py26 not having ordereddict."""
try:
return collections.OrderedDict(*args, **kwargs)
except AttributeError:
import ordereddict
return ordereddict.OrderedDict(*args, **kwargs)
def execute(*cmd, **kwargs):
"""Convenience wrapper around oslo's execute() method."""
result = processutils.execute(*cmd, **kwargs)