diff --git a/ldv_migrate/bin_xxx/ldv_migrate b/ldv_migrate/bin_xxx/ldv_migrate deleted file mode 100644 index 329efa4124c9e0a630997123c25cabcae6257c75..0000000000000000000000000000000000000000 --- a/ldv_migrate/bin_xxx/ldv_migrate +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python3 - -import ldv_migrate -migrate_ldvadmin_to_ldvspec.main() \ No newline at end of file diff --git a/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py b/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py index 5fbb505c88830cabff072ef65a7fa54aa352fa4e..21f56843eb061e7e21b3c427640d6216281d0aed 100644 --- a/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py +++ b/ldv_migrate/ldv_migrate/connection/retrieve_db_connection.py @@ -1,16 +1,12 @@ import sys import psycopg2 -try: - from connection.config import read_config -except: - from ldv_migrate.connection.config import read_config - import logging import argparse from sshtunnel import SSHTunnelForwarder import os +from ldv_migrate.connection.config import read_config def connect_postgresql(section): """ Connect to the PostgreSQL database server """ diff --git a/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py b/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py index 6d9f2f0758faec02867cb7185c7786723a593a64..e6bee1bb0c7e01a1b81b0b0b01611803ef05c626 100644 --- a/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py +++ b/ldv_migrate/ldv_migrate/migrate_ldvadmin_to_ldvspec.py @@ -22,17 +22,9 @@ import argparse import sys import math -try: - # local imports - import connection.retrieve_db_connection as connector - from ldv_specification_interface import LDVSpecInterface - -except: - # installation imports - import ldv_migrate.connection.retrieve_db_connection as connector - from ldv_migrate.ldv_specification_interface import LDVSpecInterface - +import ldv_migrate.connection.retrieve_db_connection as connector +from ldv_migrate.ldv_specification_interface import LDVSpecInterface logger = logging.getLogger(__file__) handler = logging.StreamHandler(sys.stdout)