Merge "Clean imports in code"

This commit is contained in:
Jenkins
2016-08-29 14:29:14 +00:00
committed by Gerrit Code Review

View File

@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from collections import OrderedDict import collections
import copy import copy
import json import json
@@ -61,7 +61,7 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
# Convert the file path to file URI # Convert the file path to file URI
uri = parse.urljoin('file:', request.pathname2url(path)) uri = parse.urljoin('file:', request.pathname2url(path))
data = OrderedDict( data = collections.OrderedDict(
utils.load_content( utils.load_content(
utils.get_contents_if_file(uri) utils.get_contents_if_file(uri)
) )
@@ -97,7 +97,7 @@ class TestEnvironmentsV2(base.BaseClientV2Test):
'mistralclient', 'mistralclient',
'tests/unit/resources/env_v2.json' 'tests/unit/resources/env_v2.json'
) )
data = OrderedDict( data = collections.OrderedDict(
utils.load_content( utils.load_content(
utils.get_contents_if_file(path) utils.get_contents_if_file(path)
) )