openstack/cinder
Code Issues Proposed changes

Merge "Use utils.safe_minidom_parse_string in extensions"

Browse Source
This commit is contained in:
Jenkins
2013-08-08 16:07:54 +00:00
committed by Gerrit Code Review
parent 370c700286 4ad95dba4f
commit 957685e156
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/api/contrib/backups.py
View File

@@ -18,7 +18,6 @@
import webob
from webob import exc
from xml.dom import minidom
from cinder.api import common
from cinder.api import extensions
@@ -28,6 +27,7 @@ from cinder.api import xmlutil
from cinder import backup as backupAPI
from cinder import exception
from cinder.openstack.common import log as logging
from cinder import utils
LOG = logging.getLogger(__name__)
@@ -82,7 +82,7 @@ class BackupRestoreTemplate(xmlutil.TemplateBuilder):
class CreateDeserializer(wsgi.MetadataXMLDeserializer):
def default(self, string):
dom = minidom.parseString(string)
dom = utils.safe_minidom_parse_string(string)
backup = self._extract_backup(dom)
return {'body': {'backup': backup}}
@@ -101,7 +101,7 @@ class CreateDeserializer(wsgi.MetadataXMLDeserializer):
class RestoreDeserializer(wsgi.MetadataXMLDeserializer):
def default(self, string):
dom = minidom.parseString(string)
dom = utils.safe_minidom_parse_string(string)
restore = self._extract_restore(dom)
return {'body': {'restore': restore}}

6
cinder/api/contrib/volume_transfer.py
View File

@@ -17,7 +17,6 @@
import webob
from webob import exc
from xml.dom import minidom
from cinder.api import common
from cinder.api import extensions
@@ -28,6 +27,7 @@ from cinder.api import xmlutil
from cinder import exception
from cinder.openstack.common import log as logging
from cinder import transfer as transferAPI
from cinder import utils
LOG = logging.getLogger(__name__)
@@ -62,7 +62,7 @@ class TransfersTemplate(xmlutil.TemplateBuilder):
class CreateDeserializer(wsgi.MetadataXMLDeserializer):
def default(self, string):
dom = minidom.parseString(string)
dom = utils.safe_minidom_parse_string(string)
transfer = self._extract_transfer(dom)
return {'body': {'transfer': transfer}}
@@ -80,7 +80,7 @@ class CreateDeserializer(wsgi.MetadataXMLDeserializer):
class AcceptDeserializer(wsgi.MetadataXMLDeserializer):
def default(self, string):
dom = minidom.parseString(string)
dom = utils.safe_minidom_parse_string(string)
transfer = self._extract_transfer(dom)
return {'body': {'accept': transfer}}