Move blockdevicesetupexception.py into blockdevice.py

Less is more when it comes to code :)

Change-Id: I925ed62bdc808f0e07862f6e0905e80b50fbe942

diskimage_builder/block_device/blockdevice.py

@@ -22,14 +22,16 @@ import yaml
 
 from stevedore import extension
 
-from diskimage_builder.block_device.blockdevicesetupexception \
-    import BlockDeviceSetupException
 from diskimage_builder.graph.digraph import Digraph
 
 
 logger = logging.getLogger(__name__)
 
 
+class BlockDeviceSetupException(Exception):
+    pass
+
+
 class BlockDevice(object):
     """Handles block devices.
 

diskimage_builder/block_device/blockdevicesetupexception.py

@@ -1,17 +0,0 @@
-# Copyright 2016 Andreas Florath (andreas@florath.net)
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-
-class BlockDeviceSetupException(Exception):
-    pass

diskimage_builder/block_device/level0/localloop.py

@@ -16,8 +16,8 @@ import logging
 import os
 import subprocess
 
-from diskimage_builder.block_device.blockdevicesetupexception \
+from diskimage_builder.block_device.blockdevice import \
-    import BlockDeviceSetupException
+    BlockDeviceSetupException
 from diskimage_builder.block_device.plugin_base import NodePluginBase
 from diskimage_builder.block_device.tree_config import TreeConfig
 from diskimage_builder.block_device.utils import parse_abs_size_spec

diskimage_builder/block_device/level1/partitioning.py

@@ -17,8 +17,8 @@ import os
 
 from subprocess import CalledProcessError
 
-from diskimage_builder.block_device.blockdevicesetupexception \
+from diskimage_builder.block_device.blockdevice import \
-    import BlockDeviceSetupException
+    BlockDeviceSetupException
 from diskimage_builder.block_device.level1.mbr import MBR
 from diskimage_builder.block_device.plugin_base import PluginBase
 from diskimage_builder.block_device.tree_config import TreeConfig