diff --git a/awips/NotificationMessage.py b/awips/NotificationMessage.py index 81832f3..3e50628 100755 --- a/awips/NotificationMessage.py +++ b/awips/NotificationMessage.py @@ -36,7 +36,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.alertviz import AlertVizReq # Date Ticket# Engineer Description # ------------ ---------- ----------- -------------------------- # 09/30/08 chammack Initial Creation. -# 11/03/10 5849 cjeanbap Moved to ufpy package from +# 11/03/10 5849 cjeanbap Moved to awips package from # com.raytheon.uf.tools.cli # 01/07/11 5645 cjeanbap Added audio file to Status Message. # 05/27/11 3050 cjeanbap Added if-statement to check Priority diff --git a/awips/__init__.py b/awips/__init__.py index 6ed9ac6..f1985c4 100644 --- a/awips/__init__.py +++ b/awips/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy package +# __init__.py for awips package # # # SOFTWARE HISTORY diff --git a/awips/dataaccess/CombinedTimeQuery.py b/awips/dataaccess/CombinedTimeQuery.py index fcf9ba4..7507fff 100644 --- a/awips/dataaccess/CombinedTimeQuery.py +++ b/awips/dataaccess/CombinedTimeQuery.py @@ -31,7 +31,7 @@ # 06/22/16 #5591 bsteffen Initial Creation. # -from ufpy.dataaccess import DataAccessLayer +from awips.dataaccess import DataAccessLayer def getAvailableTimes(request, refTimeOnly=False): return __getAvailableTimesForEachParameter(request, refTimeOnly) @@ -97,4 +97,4 @@ def __cloneRequest(request): levels = request.getLevels(), locationNames = request.getLocationNames(), envelope = request.getEnvelope(), - **request.getIdentifiers()) \ No newline at end of file + **request.getIdentifiers()) diff --git a/awips/dataaccess/DataAccessLayer.py b/awips/dataaccess/DataAccessLayer.py index d1d460c..e768a87 100644 --- a/awips/dataaccess/DataAccessLayer.py +++ b/awips/dataaccess/DataAccessLayer.py @@ -20,7 +20,7 @@ # -# Published interface for ufpy.dataaccess package +# Published interface for awips.dataaccess package # # # SOFTWARE HISTORY @@ -64,7 +64,7 @@ if 'jep' in sys.modules: import JepRouter router = JepRouter else: - from ufpy.dataaccess import ThriftClientRouter + from awips.dataaccess import ThriftClientRouter router = ThriftClientRouter.ThriftClientRouter(THRIFT_HOST) USING_NATIVE_THRIFT = True @@ -273,4 +273,4 @@ def setLazyLoadGridLatLon(lazyLoadGridLatLon): router.setLazyLoadGridLatLon(lazyLoadGridLatLon) except AttributeError: # The router is not required to support this capability. - pass \ No newline at end of file + pass diff --git a/awips/dataaccess/DataNotificationLayer.py b/awips/dataaccess/DataNotificationLayer.py index cb06c6f..2ff5f84 100644 --- a/awips/dataaccess/DataNotificationLayer.py +++ b/awips/dataaccess/DataNotificationLayer.py @@ -19,7 +19,7 @@ # # # -# Published interface for retrieving data updates via ufpy.dataaccess package +# Published interface for retrieving data updates via awips.dataaccess package # # SOFTWARE HISTORY # @@ -38,7 +38,7 @@ retrieval of new data as it is coming into the system. There are two ways to access this feature: -1. The DataQueue module (ufpy.dataaccess.DataQueue) offers a collection that +1. The DataQueue module (awips.dataaccess.DataQueue) offers a collection that automatically fills up with new data as it receives notifications. See that module for more information. @@ -50,8 +50,8 @@ each time new data is received. Example code follows. This example prints temperature as observed from KOMA each time a METAR is received from there. - from ufpy.dataaccess import DataAccessLayer as DAL - from ufpy.dataaccess import DataNotificationLayer as DNL + from awips.dataaccess import DataAccessLayer as DAL + from awips.dataaccess import DataNotificationLayer as DNL def process_obs(list_of_data): for item in list_of_data: @@ -69,8 +69,8 @@ each time a METAR is received from there. import sys import subprocess -from ufpy.dataaccess.PyGeometryNotification import PyGeometryNotification -from ufpy.dataaccess.PyGridNotification import PyGridNotification +from awips.dataaccess.PyGeometryNotification import PyGeometryNotification +from awips.dataaccess.PyGridNotification import PyGridNotification THRIFT_HOST = subprocess.check_output( @@ -86,7 +86,7 @@ if 'jep' in sys.modules: import JepRouter router = JepRouter else: - from ufpy.dataaccess import ThriftClientRouter + from awips.dataaccess import ThriftClientRouter router = ThriftClientRouter.ThriftClientRouter(THRIFT_HOST) USING_NATIVE_THRIFT = True diff --git a/awips/dataaccess/DataQueue.py b/awips/dataaccess/DataQueue.py index c37339e..9791787 100644 --- a/awips/dataaccess/DataQueue.py +++ b/awips/dataaccess/DataQueue.py @@ -33,7 +33,7 @@ # 07/29/16 2416 tgurney Initial creation # -from ufpy.dataaccess import DataNotificationLayer as DNL +from awips.dataaccess import DataNotificationLayer as DNL import time from threading import Thread @@ -206,4 +206,4 @@ class DataQueue(object): return self def __exit__(self, *unused): - self.close() \ No newline at end of file + self.close() diff --git a/awips/dataaccess/PyData.py b/awips/dataaccess/PyData.py index 757105b..cd1afcb 100644 --- a/awips/dataaccess/PyData.py +++ b/awips/dataaccess/PyData.py @@ -31,7 +31,7 @@ # # -from ufpy.dataaccess import IData +from awips.dataaccess import IData class PyData(IData): diff --git a/awips/dataaccess/PyGeometryData.py b/awips/dataaccess/PyGeometryData.py index cacd387..d576b4f 100644 --- a/awips/dataaccess/PyGeometryData.py +++ b/awips/dataaccess/PyGeometryData.py @@ -36,8 +36,8 @@ # # -from ufpy.dataaccess import IGeometryData -from ufpy.dataaccess import PyData +from awips.dataaccess import IGeometryData +from awips.dataaccess import PyData class PyGeometryData(IGeometryData, PyData.PyData): diff --git a/awips/dataaccess/PyGeometryNotification.py b/awips/dataaccess/PyGeometryNotification.py index a8b433e..6d07f07 100644 --- a/awips/dataaccess/PyGeometryNotification.py +++ b/awips/dataaccess/PyGeometryNotification.py @@ -33,7 +33,7 @@ import dynamicserialize import traceback -from ufpy.dataaccess.PyNotification import PyNotification +from awips.dataaccess.PyNotification import PyNotification class PyGeometryNotification(PyNotification): diff --git a/awips/dataaccess/PyGridData.py b/awips/dataaccess/PyGridData.py index 991e1d9..8e9f7aa 100644 --- a/awips/dataaccess/PyGridData.py +++ b/awips/dataaccess/PyGridData.py @@ -38,8 +38,8 @@ import numpy import warnings -from ufpy.dataaccess import IGridData -from ufpy.dataaccess import PyData +from awips.dataaccess import IGridData +from awips.dataaccess import PyData NO_UNIT_CONVERT_WARNING = """ The ability to unit convert grid data is not currently available in this version of the Data Access Framework. diff --git a/awips/dataaccess/PyGridNotification.py b/awips/dataaccess/PyGridNotification.py index ff57f69..0a525eb 100644 --- a/awips/dataaccess/PyGridNotification.py +++ b/awips/dataaccess/PyGridNotification.py @@ -33,7 +33,7 @@ import dynamicserialize import traceback -from ufpy.dataaccess.PyNotification import PyNotification +from awips.dataaccess.PyNotification import PyNotification class PyGridNotification(PyNotification): diff --git a/awips/dataaccess/PyNotification.py b/awips/dataaccess/PyNotification.py index 86e9842..71f04de 100644 --- a/awips/dataaccess/PyNotification.py +++ b/awips/dataaccess/PyNotification.py @@ -36,9 +36,9 @@ import abc -from ufpy.dataaccess import DataAccessLayer -from ufpy.dataaccess import INotificationSubscriber -from ufpy.QpidSubscriber import QpidSubscriber +from awips.dataaccess import DataAccessLayer +from awips.dataaccess import INotificationSubscriber +from awips.QpidSubscriber import QpidSubscriber from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime diff --git a/awips/dataaccess/SoundingsSupport.py b/awips/dataaccess/SoundingsSupport.py index f5474cc..e3ec8b8 100644 --- a/awips/dataaccess/SoundingsSupport.py +++ b/awips/dataaccess/SoundingsSupport.py @@ -34,8 +34,8 @@ from collections import defaultdict from shapely.geometry import Point -from ufpy import DateTimeConverter -from ufpy.dataaccess import DataAccessLayer +from awips import DateTimeConverter +from awips.dataaccess import DataAccessLayer from dynamicserialize.dstypes.com.raytheon.uf.common.time import DataTime from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level diff --git a/awips/dataaccess/ThriftClientRouter.py b/awips/dataaccess/ThriftClientRouter.py index 713011e..1c97bc1 100644 --- a/awips/dataaccess/ThriftClientRouter.py +++ b/awips/dataaccess/ThriftClientRouter.py @@ -61,9 +61,9 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataaccess.request import G from dynamicserialize.dstypes.com.raytheon.uf.common.dataaccess.request import GetSupportedDatatypesRequest from dynamicserialize.dstypes.com.raytheon.uf.common.dataaccess.request import GetNotificationFilterRequest -from ufpy import ThriftClient -from ufpy.dataaccess import PyGeometryData -from ufpy.dataaccess import PyGridData +from awips import ThriftClient +from awips.dataaccess import PyGeometryData +from awips.dataaccess import PyGridData class LazyGridLatLon(object): diff --git a/awips/dataaccess/__init__.py b/awips/dataaccess/__init__.py index 48a2dda..1bf6df0 100644 --- a/awips/dataaccess/__init__.py +++ b/awips/dataaccess/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy.dataaccess package +# __init__.py for awips.dataaccess package # # # SOFTWARE HISTORY diff --git a/awips/gfe/IFPClient.py b/awips/gfe/IFPClient.py index 1288094..d1e3f46 100644 --- a/awips/gfe/IFPClient.py +++ b/awips/gfe/IFPClient.py @@ -18,7 +18,7 @@ # further licensing information. ## -from ufpy import ThriftClient +from awips import ThriftClient from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import ParmID diff --git a/awips/gfe/__init__.py b/awips/gfe/__init__.py index f2a16d5..0e5965a 100644 --- a/awips/gfe/__init__.py +++ b/awips/gfe/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy.gfe package +# __init__.py for awips.gfe package # # # SOFTWARE HISTORY diff --git a/awips/localization/LocalizationFileManager.py b/awips/localization/LocalizationFileManager.py index d22fe51..78508f4 100644 --- a/awips/localization/LocalizationFileManager.py +++ b/awips/localization/LocalizationFileManager.py @@ -254,7 +254,7 @@ def _getHost(): def _getSiteFromServer(host): try: - from ufpy import ThriftClient + from awips import ThriftClient from dynamicserialize.dstypes.com.raytheon.uf.common.site.requests import GetPrimarySiteRequest client = ThriftClient.ThriftClient(host) return client.sendRequest(GetPrimarySiteRequest()) diff --git a/awips/localization/__init__.py b/awips/localization/__init__.py index e138466..dfa4ebd 100644 --- a/awips/localization/__init__.py +++ b/awips/localization/__init__.py @@ -19,7 +19,7 @@ ## # -# __init__.py for ufpy.localization package +# __init__.py for awips.localization package # # # SOFTWARE HISTORY @@ -29,4 +29,4 @@ # 08/10/17 5731 bsteffen Initial Creation. __all__ = [ - ] \ No newline at end of file + ] diff --git a/awips/test/__init__.py b/awips/test/__init__.py index ae5228c..65dffe0 100644 --- a/awips/test/__init__.py +++ b/awips/test/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy package +# __init__.py for awips package # # # SOFTWARE HISTORY diff --git a/awips/test/dafTests/__init__.py b/awips/test/dafTests/__init__.py index 5ce6ada..6041dc1 100644 --- a/awips/test/dafTests/__init__.py +++ b/awips/test/dafTests/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy.test.dafTests package +# __init__.py for awips.test.dafTests package # # # SOFTWARE HISTORY diff --git a/awips/test/dafTests/baseBufrMosTestCase.py b/awips/test/dafTests/baseBufrMosTestCase.py index a62fada..d05ba2f 100644 --- a/awips/test/dafTests/baseBufrMosTestCase.py +++ b/awips/test/dafTests/baseBufrMosTestCase.py @@ -18,7 +18,7 @@ # further licensing information. ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/baseDafTestCase.py b/awips/test/dafTests/baseDafTestCase.py index 0615f23..4388f16 100644 --- a/awips/test/dafTests/baseDafTestCase.py +++ b/awips/test/dafTests/baseDafTestCase.py @@ -20,8 +20,8 @@ -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException import os import numpy diff --git a/awips/test/dafTests/baseRadarTestCase.py b/awips/test/dafTests/baseRadarTestCase.py index 96d8ed4..e0388ff 100644 --- a/awips/test/dafTests/baseRadarTestCase.py +++ b/awips/test/dafTests/baseRadarTestCase.py @@ -19,8 +19,8 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testAcars.py b/awips/test/dafTests/testAcars.py index 3a22f3b..7805f9e 100644 --- a/awips/test/dafTests/testAcars.py +++ b/awips/test/dafTests/testAcars.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseDafTestCase diff --git a/awips/test/dafTests/testAirep.py b/awips/test/dafTests/testAirep.py index 16ec729..f0941de 100644 --- a/awips/test/dafTests/testAirep.py +++ b/awips/test/dafTests/testAirep.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testBinLightning.py b/awips/test/dafTests/testBinLightning.py index 7ba6b61..6e6add7 100644 --- a/awips/test/dafTests/testBinLightning.py +++ b/awips/test/dafTests/testBinLightning.py @@ -1,4 +1,4 @@ -## +# # This software was developed and / or modified by Raytheon Company, # pursuant to Contract DG133W-05-CQ-1067 with the US Government. # @@ -19,8 +19,8 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint diff --git a/awips/test/dafTests/testBufrUa.py b/awips/test/dafTests/testBufrUa.py index 2c4cd32..41a5102 100644 --- a/awips/test/dafTests/testBufrUa.py +++ b/awips/test/dafTests/testBufrUa.py @@ -19,7 +19,7 @@ # # -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testClimate.py b/awips/test/dafTests/testClimate.py index 3738212..e4edc54 100644 --- a/awips/test/dafTests/testClimate.py +++ b/awips/test/dafTests/testClimate.py @@ -22,8 +22,8 @@ import datetime from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testCommonObsSpatial.py b/awips/test/dafTests/testCommonObsSpatial.py index 5eb294b..72dd80b 100644 --- a/awips/test/dafTests/testCommonObsSpatial.py +++ b/awips/test/dafTests/testCommonObsSpatial.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testFfmp.py b/awips/test/dafTests/testFfmp.py index cd0bc7a..da45840 100644 --- a/awips/test/dafTests/testFfmp.py +++ b/awips/test/dafTests/testFfmp.py @@ -20,7 +20,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testGfeEditArea.py b/awips/test/dafTests/testGfeEditArea.py index 8c6c0b8..6cb9c1c 100644 --- a/awips/test/dafTests/testGfeEditArea.py +++ b/awips/test/dafTests/testGfeEditArea.py @@ -20,8 +20,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testGrid.py b/awips/test/dafTests/testGrid.py index abb196b..0d1ced9 100644 --- a/awips/test/dafTests/testGrid.py +++ b/awips/test/dafTests/testGrid.py @@ -21,8 +21,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from shapely.geometry import box, Point -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testHydro.py b/awips/test/dafTests/testHydro.py index 4639844..2eb79b7 100644 --- a/awips/test/dafTests/testHydro.py +++ b/awips/test/dafTests/testHydro.py @@ -20,8 +20,8 @@ import datetime -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange diff --git a/awips/test/dafTests/testLdadMesonet.py b/awips/test/dafTests/testLdadMesonet.py index 924022d..2cd9f5e 100644 --- a/awips/test/dafTests/testLdadMesonet.py +++ b/awips/test/dafTests/testLdadMesonet.py @@ -20,7 +20,7 @@ from shapely.geometry import Polygon -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseDafTestCase diff --git a/awips/test/dafTests/testMaps.py b/awips/test/dafTests/testMaps.py index 75f5a11..69ba410 100644 --- a/awips/test/dafTests/testMaps.py +++ b/awips/test/dafTests/testMaps.py @@ -20,8 +20,8 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase diff --git a/awips/test/dafTests/testModelSounding.py b/awips/test/dafTests/testModelSounding.py index 7d8525b..0a3e3b1 100644 --- a/awips/test/dafTests/testModelSounding.py +++ b/awips/test/dafTests/testModelSounding.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testObs.py b/awips/test/dafTests/testObs.py index 2ea9354..ebb190d 100644 --- a/awips/test/dafTests/testObs.py +++ b/awips/test/dafTests/testObs.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testPirep.py b/awips/test/dafTests/testPirep.py index 5fa7467..a890cd6 100644 --- a/awips/test/dafTests/testPirep.py +++ b/awips/test/dafTests/testPirep.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseDafTestCase from . import params diff --git a/awips/test/dafTests/testRadarGraphics.py b/awips/test/dafTests/testRadarGraphics.py index e3ac56c..027ba9f 100644 --- a/awips/test/dafTests/testRadarGraphics.py +++ b/awips/test/dafTests/testRadarGraphics.py @@ -19,7 +19,7 @@ ## from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from . import baseRadarTestCase from . import params diff --git a/awips/test/dafTests/testRadarGrid.py b/awips/test/dafTests/testRadarGrid.py index 6385d29..bbab194 100644 --- a/awips/test/dafTests/testRadarGrid.py +++ b/awips/test/dafTests/testRadarGrid.py @@ -1,4 +1,4 @@ -## +# # This software was developed and / or modified by Raytheon Company, # pursuant to Contract DG133W-05-CQ-1067 with the US Government. # @@ -18,7 +18,7 @@ # further licensing information. ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseRadarTestCase diff --git a/awips/test/dafTests/testRadarSpatial.py b/awips/test/dafTests/testRadarSpatial.py index 038993a..7c702d4 100644 --- a/awips/test/dafTests/testRadarSpatial.py +++ b/awips/test/dafTests/testRadarSpatial.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testSatellite.py b/awips/test/dafTests/testSatellite.py index 0a412d8..0522ed0 100644 --- a/awips/test/dafTests/testSatellite.py +++ b/awips/test/dafTests/testSatellite.py @@ -20,7 +20,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testSfcObs.py b/awips/test/dafTests/testSfcObs.py index d264f9b..b4dd6aa 100644 --- a/awips/test/dafTests/testSfcObs.py +++ b/awips/test/dafTests/testSfcObs.py @@ -19,7 +19,7 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL +from awips.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from . import baseDafTestCase diff --git a/awips/test/dafTests/testTopo.py b/awips/test/dafTests/testTopo.py index b33193b..3ae14c3 100644 --- a/awips/test/dafTests/testTopo.py +++ b/awips/test/dafTests/testTopo.py @@ -19,8 +19,8 @@ ## -from ufpy.dataaccess import DataAccessLayer as DAL -from ufpy.ThriftClient import ThriftRequestException +from awips.dataaccess import DataAccessLayer as DAL +from awips.ThriftClient import ThriftRequestException from . import baseDafTestCase import shapely.geometry diff --git a/awips/test/localization/__init__.py b/awips/test/localization/__init__.py index a178a51..865678d 100644 --- a/awips/test/localization/__init__.py +++ b/awips/test/localization/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for ufpy.test.localization package +# __init__.py for awips.test.localization package # # # SOFTWARE HISTORY diff --git a/awips/test/localization/testLocalizationFileManager.py b/awips/test/localization/testLocalizationFileManager.py index bbb1b38..3857dc1 100644 --- a/awips/test/localization/testLocalizationFileManager.py +++ b/awips/test/localization/testLocalizationFileManager.py @@ -30,7 +30,7 @@ import unittest -from ufpy.localization.LocalizationFileManager import (LocalizationFileManager, +from awips.localization.LocalizationFileManager import (LocalizationFileManager, LocalizationFileVersionConflictException, LocalizationContext, LocalizationFileIsNotDirectoryException, diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py index 1808170..95be69e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py @@ -31,7 +31,7 @@ # -from ufpy.dataaccess import IDataRequest +from awips.dataaccess import IDataRequest from dynamicserialize.dstypes.org.locationtech.jts.geom import Envelope from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultNotificationFilter.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultNotificationFilter.py index 6d931c4..b7fe0eb 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultNotificationFilter.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultNotificationFilter.py @@ -31,7 +31,7 @@ # -from ufpy.dataaccess import INotificationFilter +from awips.dataaccess import INotificationFilter import sys class DefaultNotificationFilter(INotificationFilter):