Fix python2.6 compatibility issues (for CentOS).
Change-Id: I8d9a64a85e6b6b7c45b99027058c0d2c0ec6310b
This commit is contained in:
parent
3ae6265e14
commit
7a56aa9010
@ -13,7 +13,7 @@
|
||||
# under the License.
|
||||
import os
|
||||
from django.template.defaultfilters import slugify
|
||||
from collections import OrderedDict
|
||||
from ordereddict import OrderedDict
|
||||
from yaml.scanner import ScannerError
|
||||
import yaml
|
||||
import re
|
||||
@ -34,8 +34,9 @@ def import_all_services():
|
||||
if (not name in _all_services or
|
||||
_all_services[name][0] < modified_on):
|
||||
with open(path) as f:
|
||||
kwargs = {utils.decamelize(k): v
|
||||
for k, v in yaml.load(f).iteritems()}
|
||||
kwargs = dict(
|
||||
(utils.decamelize(k), v)
|
||||
for (k, v) in yaml.load(f).iteritems())
|
||||
_all_services[name] = (modified_on,
|
||||
type(name, (), kwargs))
|
||||
except ScannerError:
|
||||
|
@ -225,8 +225,9 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
|
||||
if type(spec) == list:
|
||||
return [parse_spec(_spec) for _spec in spec]
|
||||
elif type(spec) == dict:
|
||||
return {parse_spec(k): parse_spec(v)
|
||||
for k, v in spec.iteritems()}
|
||||
return dict(
|
||||
(parse_spec(k), parse_spec(v))
|
||||
for (k, v) in spec.iteritems())
|
||||
elif (type(spec) in (str, unicode) and
|
||||
spec[0] == self.EVAL_PREFIX):
|
||||
return data.get(spec[1:])
|
||||
@ -237,7 +238,7 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
|
||||
def extract_attributes(self, attributes):
|
||||
def get_data(name):
|
||||
if type(name) == dict:
|
||||
return {k: get_data(v) for k, v in name.iteritems()}
|
||||
return dict((k, get_data(v)) for (k, v) in name.iteritems())
|
||||
else:
|
||||
return self.cleaned_data[name]
|
||||
for attr_name, field_name in self.attribute_mappings.iteritems():
|
||||
|
@ -9,3 +9,4 @@ six
|
||||
django-pipeline
|
||||
django-floppyforms==1.1
|
||||
PyYAML
|
||||
ordereddict
|
||||
|
Loading…
Reference in New Issue
Block a user