Replaced all remaining instances of "ufpy" with "awips"

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

awips/__init__.py

@@ -20,7 +20,7 @@
 
 
 #
-# __init__.py for ufpy package
+# __init__.py for awips package
 #  
 #    
 #     SOFTWARE HISTORY

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())
+                                          **request.getIdentifiers())

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
+        pass

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
 

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()
+        self.close()

awips/dataaccess/PyData.py

@@ -31,7 +31,7 @@
 #    
 #
 
-from ufpy.dataaccess import IData
+from awips.dataaccess import IData
 
 class PyData(IData):
     

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):
     

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):
 

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.

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):
 

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
 
 

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

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):

awips/dataaccess/__init__.py

@@ -20,7 +20,7 @@
 
 
 #
-# __init__.py for ufpy.dataaccess package
+# __init__.py for awips.dataaccess package
 #
 #
 #     SOFTWARE HISTORY

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

awips/gfe/__init__.py

@@ -20,7 +20,7 @@
 
 
 #
-# __init__.py for ufpy.gfe package
+# __init__.py for awips.gfe package
 #  
 #    
 #     SOFTWARE HISTORY

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())

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__ = [           
-           ]
+           ]

awips/test/__init__.py

@@ -20,7 +20,7 @@
 
 
 #
-# __init__.py for ufpy package
+# __init__.py for awips package
 #  
 #    
 #     SOFTWARE HISTORY

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

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

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

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

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
 

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

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
 
 

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

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

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

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

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

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

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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,

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

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):