Re-format import statement

For readability re-formatted the import statement to be alphabetical
and multilined.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>

Author: mnowster

compose/config/config.py

@@ -13,7 +13,11 @@
     CircularReference,
     ComposeFileNotFound,
 )
-from .validation import validate_service_names, validate_top_level_object, validate_against_schema
+from .validation import (
+    validate_against_schema,
+    validate_service_names,
+    validate_top_level_object
+)
 
 
 DOCKER_CONFIG_KEYS = [
@@ -141,7 +145,7 @@ def load(config_details):
 
     service_dicts = []
 
-    for service_name, service_dict in list(config.items()):
+    for service_name, service_dict in list(processed_config.items()):
         loader = ServiceLoader(working_dir=working_dir, filename=filename)
         service_dict = loader.make_service_dict(service_name, service_dict)
         validate_paths(service_dict)

compose/config/validation.py

@@ -1,3 +1,4 @@
+from functools import wraps
 import os
 
 from docker.utils.ports import split_port
@@ -37,21 +38,25 @@ def format_ports(instance):
 
 
 def validate_service_names(func):
+    @wraps(func)
     def func_wrapper(config):
-        for service_name in func(config).keys():
+        for service_name in config.keys():
             if type(service_name) is int:
                 raise ConfigurationError(
                     "Service name: {} needs to be a string, eg '{}'".format(service_name, service_name)
                 )
+        return func(config)
     return func_wrapper
 
 
 def validate_top_level_object(func):
+    @wraps(func)
     def func_wrapper(config):
-        if not isinstance(func(config), dict):
+        if not isinstance(config, dict):
             raise ConfigurationError(
                 "Top level object needs to be a dictionary. Check your .yml file that you have defined a service at the top level."
             )
+        return func(config)
     return func_wrapper