fix: modular import bug

Author: altor

powerapi/database/__init__.py

@@ -27,22 +27,9 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import logging
 from powerapi.database.base_db import BaseDB, IterDB, DBError
 from powerapi.database.csvdb import CsvDB, CsvBadFilePathError
 from powerapi.database.csvdb import CsvBadCommonKeysError, HeaderAreNotTheSameError
-try:
-    from powerapi.database.mongodb import MongoDB, MongoBadDBError
-
-except ImportError:
-    logging.getLogger().info("PyMongo is not installed.")
-
-try:
-    from powerapi.database.opentsdb import OpenTSDB, CantConnectToOpenTSDBException
-except ImportError:
-    logging.getLogger().info("opentsdb-py is not installed.")
-
-try:
-    from powerapi.database.influxdb import InfluxDB, CantConnectToInfluxDBException
-except ImportError:
-    logging.getLogger().info("influx-client is not installed.")
+from powerapi.database.mongodb import MongoDB, MongoBadDBError
+from powerapi.database.opentsdb import OpenTSDB, CantConnectToOpenTSDBException
+from powerapi.database.influxdb import InfluxDB, CantConnectToInfluxDBException

powerapi/database/influxdb.py

@@ -27,12 +27,18 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+import logging
+try:
+    from influxdb import InfluxDBClient
+except ImportError:
+    logging.getLogger().info("influx-client is not installed.")
+
 from typing import List
 
-from influxdb.exceptions import InfluxDBClientError, InfluxDBServerError
 from requests.exceptions import ConnectionError
 from powerapi.database import BaseDB, DBError
-from influxdb import InfluxDBClient
+
 from powerapi.report import Report
 from powerapi.report_model import ReportModel
 

powerapi/database/mongodb.py

@@ -27,8 +27,11 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import pymongo
-from pymongo.errors import ConnectionFailure
+import logging
+try:
+    import pymongo
+except ImportError:
+    logging.getLogger().info("PyMongo is not installed.")
 
 from typing import List
 from powerapi.database.base_db import BaseDB, DBError, IterDB

powerapi/database/opentsdb.py

@@ -26,10 +26,14 @@
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import logging
+try:
+    from opentsdb import TSDBClient
+except ImportError:
+    logging.getLogger().info("opentsdb-py is not installed.")
+
 from typing import List
 
-import logging
-from opentsdb import TSDBClient
 from powerapi.report import PowerReport, Report
 from powerapi.report_model import ReportModel
 from powerapi.database import BaseDB, DBError