diff --git a/ambe_audio.py b/ambe_audio.py index b9ed98b..8594f37 100755 --- a/ambe_audio.py +++ b/ambe_audio.py @@ -47,12 +47,12 @@ __email__ = 'n0mjs@me.com' try: - from DMRlink.ipsc_const import * + from ipsc.ipsc_const import * except ImportError: sys.exit('IPSC constants file not found or invalid') try: - from DMRlink.ipsc_mask import * + from ipsc.ipsc_mask import * except ImportError: sys.exit('IPSC mask values file not found or invalid') @@ -626,8 +626,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/bridge.py b/bridge.py index afdf2c5..1806715 100755 --- a/bridge.py +++ b/bridge.py @@ -55,7 +55,7 @@ import sys from dmr_utils.utils import hex_str_3, hex_str_4, int_id from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, REPORT_OPCODES, build_aliases, config_reports -from DMRlink.ipsc_const import BURST_DATA_TYPE +from ipsc.ipsc_const import BURST_DATA_TYPE __author__ = 'Cortney T. Buffington, N0MJS' @@ -445,8 +445,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/confbridge.py b/confbridge.py index 3f84fec..2b6da8f 100755 --- a/confbridge.py +++ b/confbridge.py @@ -59,7 +59,7 @@ import cPickle as pickle from dmr_utils.utils import hex_str_3, hex_str_4, int_id from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, REPORT_OPCODES, build_aliases -from DMRlink.ipsc_const import BURST_DATA_TYPE +from ipsc.ipsc_const import BURST_DATA_TYPE __author__ = 'Cortney T. Buffington, N0MJS' @@ -433,8 +433,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/dmrlink.py b/dmrlink.py index 35122a7..3f8a9d5 100755 --- a/dmrlink.py +++ b/dmrlink.py @@ -44,9 +44,9 @@ from twisted.protocols.basic import NetstringReceiver from twisted.internet import reactor, task # Imports files in the dmrlink subdirectory (these things shouldn't change often) -from DMRlink.ipsc_const import * -from DMRlink.ipsc_mask import * -from DMRlink.reporting_const import * +from ipsc.ipsc_const import * +from ipsc.ipsc_mask import * +from ipsc.reporting_const import * # Imports from DMR Utilities package from dmr_utils.utils import hex_str_2, hex_str_3, hex_str_4, int_id, try_download, mk_id_dict @@ -1052,8 +1052,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/dmrlink/.gitignore b/ipsc/.gitignore similarity index 100% rename from dmrlink/.gitignore rename to ipsc/.gitignore diff --git a/dmrlink/__init__.py b/ipsc/__init__.py similarity index 100% rename from dmrlink/__init__.py rename to ipsc/__init__.py diff --git a/dmrlink/dmrlink_config.py b/ipsc/dmrlink_config.py similarity index 100% rename from dmrlink/dmrlink_config.py rename to ipsc/dmrlink_config.py diff --git a/dmrlink/dmrlink_log.py b/ipsc/dmrlink_log.py similarity index 100% rename from dmrlink/dmrlink_log.py rename to ipsc/dmrlink_log.py diff --git a/dmrlink/ipsc_const.py b/ipsc/ipsc_const.py similarity index 100% rename from dmrlink/ipsc_const.py rename to ipsc/ipsc_const.py diff --git a/dmrlink/ipsc_mask.py b/ipsc/ipsc_mask.py similarity index 100% rename from dmrlink/ipsc_mask.py rename to ipsc/ipsc_mask.py diff --git a/dmrlink/reporting_const.py b/ipsc/reporting_const.py similarity index 100% rename from dmrlink/reporting_const.py rename to ipsc/reporting_const.py diff --git a/log.py b/log.py index 9f8ca5e..221be2f 100755 --- a/log.py +++ b/log.py @@ -95,8 +95,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/play_group.py b/play_group.py index 1408966..0d40be3 100755 --- a/play_group.py +++ b/play_group.py @@ -39,7 +39,7 @@ import cPickle as pickle from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports from dmr_utils.utils import int_id, hex_str_3 -from DMRlink.ipsc_const import BURST_DATA_TYPE +from ipsc.ipsc_const import BURST_DATA_TYPE __author__ = 'Cortney T. Buffington, N0MJS' __copyright__ = 'Copyright (c) 2014 - 2015 Cortney T. Buffington, N0MJS and the K0USY Group' @@ -138,8 +138,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/playback.py b/playback.py index a2e34cd..a50bb90 100755 --- a/playback.py +++ b/playback.py @@ -119,8 +119,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/rcm.py b/rcm.py index 0dff995..87c6f6f 100755 --- a/rcm.py +++ b/rcm.py @@ -34,7 +34,7 @@ import dmrlink import sys from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports from dmr_utils.utils import get_alias, int_id -from DMRlink.ipsc_const import * +from ipsc.ipsc_const import * __author__ = 'Cortney T. Buffington, N0MJS' __copyright__ = 'Copyright (c) 2013, 2014 Cortney T. Buffington, N0MJS and the K0USY Group' @@ -149,8 +149,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/rcm_db_log.py b/rcm_db_log.py index 8ad3273..b7d7186 100755 --- a/rcm_db_log.py +++ b/rcm_db_log.py @@ -46,7 +46,7 @@ import pymysql import dmrlink from dmrlink import IPSC, mk_ipsc_systems, systems, reportFactory, build_aliases, config_reports -from DMRlink.ipsc_const import * +from ipsc.ipsc_const import * __author__ = 'Cortney T. Buffington, N0MJS' __copyright__ = 'Copyright (c) 2013, 2014 Cortney T. Buffington, N0MJS and the K0USY Group' @@ -113,8 +113,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) diff --git a/record.py b/record.py index d36e23f..ddd7b9c 100755 --- a/record.py +++ b/record.py @@ -110,8 +110,8 @@ if __name__ == '__main__': import os import signal - from DMRlink.dmrlink_config import build_config - from DMRlink.dmrlink_log import config_logging + from ipsc.dmrlink_config import build_config + from ipsc.dmrlink_log import config_logging # Change the current directory to the location of the application os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))