Merge "Removing import conditional for 'collections.abc'"
This commit is contained in:
commit
8e2f503244
|
@ -16,12 +16,7 @@
|
|||
"""switch_vlans module
|
||||
Used by the switch_vlans validation.
|
||||
"""
|
||||
import collections
|
||||
|
||||
try:
|
||||
collectionsAbc = collections.abc
|
||||
except AttributeError:
|
||||
collectionsAbc = collections
|
||||
import collections.abc as collectionsAbc
|
||||
|
||||
import os.path
|
||||
|
||||
|
|
|
@ -16,13 +16,7 @@
|
|||
# under the License.
|
||||
from six import string_types
|
||||
|
||||
import collections
|
||||
|
||||
try:
|
||||
collectionsAbc = collections.abc
|
||||
except AttributeError:
|
||||
collectionsAbc = collections
|
||||
|
||||
import collections.abc as collectionsAbc
|
||||
from glanceclient import client as glance_client
|
||||
from heatclient import client as heat_client
|
||||
from heatclient import exc as heat_exc
|
||||
|
|
Loading…
Reference in New Issue