openstack
/
murano-dashboard
Code Issues Proposed changes

Fix python2.6 compatibility issues (for CentOS). 

Change-Id: I8d9a64a85e6b6b7c45b99027058c0d2c0ec6310b
This commit is contained in:
Timur Sufiev 2013-08-15 19:15:18 +04:00
parent 3ae6265e14
commit 7a56aa9010
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
muranodashboard/panel/services/__init__.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
import os import os
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
from collections import OrderedDict from ordereddict import OrderedDict
from yaml.scanner import ScannerError from yaml.scanner import ScannerError
import yaml import yaml
import re import re
@ -34,8 +34,9 @@ def import_all_services():
if (not name in _all_services or if (not name in _all_services or
_all_services[name][0] < modified_on): _all_services[name][0] < modified_on):
with open(path) as f: with open(path) as f:
kwargs = {utils.decamelize(k): v kwargs = dict(
for k, v in yaml.load(f).iteritems()} (utils.decamelize(k), v)
for (k, v) in yaml.load(f).iteritems())
_all_services[name] = (modified_on, _all_services[name] = (modified_on,
type(name, (), kwargs)) type(name, (), kwargs))
except ScannerError: except ScannerError:

7
muranodashboard/panel/services/forms.py
View File

@ -225,8 +225,9 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
if type(spec) == list: if type(spec) == list:
return [parse_spec(_spec) for _spec in spec] return [parse_spec(_spec) for _spec in spec]
elif type(spec) == dict: elif type(spec) == dict:
return {parse_spec(k): parse_spec(v) return dict(
for k, v in spec.iteritems()} (parse_spec(k), parse_spec(v))
for (k, v) in spec.iteritems())
elif (type(spec) in (str, unicode) and elif (type(spec) in (str, unicode) and
spec[0] == self.EVAL_PREFIX): spec[0] == self.EVAL_PREFIX):
return data.get(spec[1:]) return data.get(spec[1:])
@ -237,7 +238,7 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
def extract_attributes(self, attributes): def extract_attributes(self, attributes):
def get_data(name): def get_data(name):
if type(name) == dict: 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: else:
return self.cleaned_data[name] return self.cleaned_data[name]
for attr_name, field_name in self.attribute_mappings.iteritems(): for attr_name, field_name in self.attribute_mappings.iteritems():

1
tools/pip-requires
View File

@ -9,3 +9,4 @@ six
django-pipeline django-pipeline
django-floppyforms==1.1 django-floppyforms==1.1
PyYAML PyYAML
ordereddict