ufpy update from master_17.1.1p2

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py

@@ -2,7 +2,6 @@
 # File auto-generated by PythonFileGenerator
 
 __all__ = [
-            'atcf',
             'gempak',
             'gpd',
             'pgen'

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py

@@ -1,59 +1,17 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetGridDataRequest(object):
 
     def __init__(self):
-        self.vcoord = None
-        self.level2 = None
-        self.modelId = None
-        self.parm = None
-        self.level1 = None
-        self.reftime = None
         self.pluginName = None
+        self.modelId = None
+        self.reftime = None
         self.fcstsec = None
-
+        self.level1 = None
-    def getVcoord(self):
+        self.level2 = None
-        return self.vcoord
+        self.vcoord = None
-
+        self.parm = None
-    def setVcoord(self, vcoord):
-        self.vcoord = vcoord
-
-    def getLevel2(self):
-        return self.level2
-
-    def setLevel2(self, level2):
-        self.level2 = level2
-
-    def getModelId(self):
-        return self.modelId
-
-    def setModelId(self, modelId):
-        self.modelId = modelId
-
-    def getParm(self):
-        return self.parm
-
-    def setParm(self, parm):
-        self.parm = parm
-
-    def getLevel1(self):
-        return self.level1
-
-    def setLevel1(self, level1):
-        self.level1 = level1
-
-    def getReftime(self):
-        return self.reftime
-
-    def setReftime(self, reftime):
-        self.reftime = reftime
 
     def getPluginName(self):
         return self.pluginName
@@ -61,9 +19,44 @@ class GetGridDataRequest(object):
     def setPluginName(self, pluginName):
         self.pluginName = pluginName
 
+    def getModelId(self):
+        return self.modelId
+
+    def setModelId(self, modelId):
+        self.modelId = modelId
+
+    def getReftime(self):
+        return self.reftime
+
+    def setReftime(self, reftime):
+        self.reftime = reftime
+
     def getFcstsec(self):
         return self.fcstsec
 
-    def setFcstsec(self, fcstsec):
+    def setFcstSec(self, fcstsec):
         self.fcstsec = fcstsec
 
+    def getLevel1(self):
+        return self.level1
+
+    def setLevel1(self, level1):
+        self.level1 = level1
+
+    def getLevel2(self):
+        return self.level2
+
+    def setLevel2(self, level2):
+        self.level2 = level2
+
+    def getVcoord(self):
+        return self.vcoord
+
+    def setVcoord(self, vcoord):
+        self.vcoord = vcoord
+
+    def getParm(self):
+        return self.parm
+
+    def setParm(self, parm):
+        self.parm = parm

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py

@@ -1,31 +1,11 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetGridInfoRequest(object):
 
     def __init__(self):
-        self.modelId = None
-        self.reftime = None
         self.pluginName = None
-        self.fcstsec = None
+        self.modelId = None
-
-    def getModelId(self):
-        return self.modelId
-
-    def setModelId(self, modelId):
-        self.modelId = modelId
-
-    def getReftime(self):
-        return self.reftime
-
-    def setReftime(self, reftime):
-        self.reftime = reftime
 
     def getPluginName(self):
         return self.pluginName
@@ -33,9 +13,9 @@ class GetGridInfoRequest(object):
     def setPluginName(self, pluginName):
         self.pluginName = pluginName
 
-    def getFcstsec(self):
+    def getModelId(self):
-        return self.fcstsec
+        return self.modelId
 
-    def setFcstsec(self, fcstsec):
+    def setModelId(self, modelId):
-        self.fcstsec = fcstsec
+        self.modelId = modelId
 

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py

@@ -1,23 +1,11 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetGridNavRequest(object):
 
     def __init__(self):
-        self.modelId = None
         self.pluginName = None
-
+        self.modelId = None
-    def getModelId(self):
-        return self.modelId
-
-    def setModelId(self, modelId):
-        self.modelId = modelId
 
     def getPluginName(self):
         return self.pluginName
@@ -25,3 +13,9 @@ class GetGridNavRequest(object):
     def setPluginName(self, pluginName):
         self.pluginName = pluginName
 
+    def getModelId(self):
+        return self.modelId
+
+    def setModelId(self, modelId):
+        self.modelId = modelId
+

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py

@@ -1,11 +1,5 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetStationsRequest(object):
 
@@ -17,4 +11,3 @@ class GetStationsRequest(object):
 
     def setPluginName(self, pluginName):
         self.pluginName = pluginName
-

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py

@@ -1,11 +1,5 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetTimesRequest(object):
 

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py

@@ -1,11 +1,5 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class GetTimesResponse(object):
 

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py

@@ -1,36 +1,16 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
-
-import numpy
 
 class Station(object):
 
     def __init__(self):
-        self.elevation = None
-        self.state = None
         self.stationId = None
-        self.longitude = None
-        self.latitude = None
         self.wmoIndex = None
+        self.elevation = None
         self.country = None
-
+        self.state = None
-    def getElevation(self):
+        self.latitude = None
-        return self.elevation
+        self.longitude = None
-
-    def setElevation(self, elevation):
-        self.elevation = elevation
-
-    def getState(self):
-        return self.state
-
-    def setState(self, state):
-        self.state = state
 
     def getStationId(self):
         return self.stationId
@@ -38,27 +18,39 @@ class Station(object):
     def setStationId(self, stationId):
         self.stationId = stationId
 
-    def getLongitude(self):
-        return self.longitude
-
-    def setLongitude(self, longitude):
-        self.longitude = numpy.float64(longitude)
-
-    def getLatitude(self):
-        return self.latitude
-
-    def setLatitude(self, latitude):
-        self.latitude = numpy.float64(latitude)
-
     def getWmoIndex(self):
         return self.wmoIndex
 
     def setWmoIndex(self, wmoIndex):
         self.wmoIndex = wmoIndex
 
+    def getElevation(self):
+        return self.elevation
+
+    def setElevation(self, elevation):
+        self.elevation = elevation
+
     def getCountry(self):
         return self.country
 
     def setCountry(self, country):
         self.country = country
 
+    def getState(self):
+        return self.state
+
+    def setState(self, state):
+        self.state = state
+
+    def getLatitude(self):
+        return self.latitude
+
+    def setLatitude(self, latitude):
+        self.latitude = latitude
+
+    def getLongitude(self):
+        return self.longitude
+
+    def setLongitude(self, longitude):
+        self.longitude = longitude
+

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py

@@ -1,45 +1,39 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
-# 
-#      SOFTWARE HISTORY
-# 
-#     Date            Ticket#       Engineer       Description
-#     ------------    ----------    -----------    --------------------------
-#     Sep 16, 2016                  pmoyer         Generated
 
 class StationDataRequest(object):
 
     def __init__(self):
-        self.refTime = None
         self.pluginName = None
-        self.parmList = None
         self.stationId = None
+        self.refTime = None
+        self.parmList = None
         self.partNumber = None
 
-    def getRefTime(self):
-        return self.refTime
-
-    def setRefTime(self, refTime):
-        self.refTime = refTime
-
     def getPluginName(self):
         return self.pluginName
 
     def setPluginName(self, pluginName):
         self.pluginName = pluginName
 
-    def getParmList(self):
-        return self.parmList
-
-    def setParmList(self, parmList):
-        self.parmList = parmList
-
     def getStationId(self):
         return self.stationId
 
     def setStationId(self, stationId):
         self.stationId = stationId
 
+    def getRefTime(self):
+        return self.refTime
+
+    def setRefTime(self, refTime):
+        self.refTime = refTime
+
+    def getParmList(self):
+        return self.parmList
+
+    def setParmList(self, parmList):
+        self.parmList = parmList
+
     def getPartNumber(self):
         return self.partNumber
 

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py

@@ -2,26 +2,21 @@
 # File auto-generated by PythonFileGenerator
 
 __all__ = [
-            'GetGridDataRequest',
-            'GetGridInfoRequest',
-            'GetGridNavRequest',
-            'GetStationsRequest',
             'GetTimesRequest',
+            'GetStationsRequest',
             'GetTimesResponse',
             'Station',
             'StationDataRequest',
-            'SurfaceDataRequest',
+            'GetGridDataRequest',
-            'UpperAirDataRequest'
+            'GetGridInfoRequest',
+            'GetGridNavRequest'
           ]
 
-from GetGridDataRequest import GetGridDataRequest
-from GetGridInfoRequest import GetGridInfoRequest
-from GetGridNavRequest import GetGridNavRequest
-from GetStationsRequest import GetStationsRequest
 from GetTimesRequest import GetTimesRequest
+from GetStationsRequest import GetStationsRequest
 from GetTimesResponse import GetTimesResponse
 from Station import Station
 from StationDataRequest import StationDataRequest
-from SurfaceDataRequest import SurfaceDataRequest
+from GetGridDataRequest import GetGridDataRequest
-from UpperAirDataRequest import UpperAirDataRequest
+from GetGridInfoRequest import GetGridInfoRequest
-
+from GetGridNavRequest import GetGridNavRequest

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py

@@ -5,8 +5,7 @@ __all__ = [
             'ActivityInfo',
             'DerivedProduct',
             'ResponseMessageValidate',
-            'request',
+            'request'
-            'response'
           ]
 
 from ActivityInfo import ActivityInfo

pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py

@@ -4,12 +4,10 @@
 __all__ = [
             'RetrieveAllProductsRequest',
             'StoreActivityRequest',
-            'StoreDerivedProductRequest',
+            'StoreDerivedProductRequest'
-            'RetrieveActivityMapRequest'
           ]
 
 from RetrieveAllProductsRequest import RetrieveAllProductsRequest
 from StoreActivityRequest import StoreActivityRequest
 from StoreDerivedProductRequest import StoreDerivedProductRequest
-from RetrieveActivityMapRequest import RetrieveActivityMapRequest
 

pythonPackages/ufpy/test/Test

@@ -39,7 +39,7 @@
 
 import os
 import logging
-from awips import AlertVizHandler
+from ufpy import AlertVizHandler
 import Record
 
 avh = AlertVizHandler.AlertVizHandler(host=os.getenv("BROKER_ADDR","localhost"), port=9581, category='LOCAL', source='ANNOUNCER', level=logging.NOTSET)

pythonPackages/ufpy/test/__init__.py

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

pythonPackages/ufpy/test/dafTests/__init__.py

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

pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py

@@ -18,7 +18,7 @@
 # further licensing information.
 ##
 
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 

pythonPackages/ufpy/test/dafTests/baseDafTestCase.py

@@ -20,8 +20,8 @@
 
 from __future__ import print_function
 
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import os
 import unittest

pythonPackages/ufpy/test/dafTests/testAcars.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testAirep.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testBinLightning.py

@@ -19,8 +19,8 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 

pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseBufrMosTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseBufrMosTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testBufrUa.py

@@ -19,7 +19,7 @@
 # #
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testClimate.py

@@ -22,8 +22,8 @@ from __future__ import print_function
 import datetime
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testCombinedTimeQuery.py

@@ -18,9 +18,9 @@
 # further licensing information.
 ##
 
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
-from awips.dataaccess import CombinedTimeQuery as CTQ
+from ufpy.dataaccess import CombinedTimeQuery as CTQ
 
 import unittest
 import os
@@ -49,7 +49,7 @@ class CombinedTimeQueryTestCase(unittest.TestCase):
 
     def testSuccessfulQuery(self):
         req = DAL.newDataRequest('grid')
-        req.setLocationNames('RAP13')
+        req.setLocationNames('RUC130')
         req.setParameters('T','GH')
         req.setLevels('300MB', '500MB','700MB')
         times = CTQ.getAvailableTimes(req);
@@ -60,7 +60,7 @@ class CombinedTimeQueryTestCase(unittest.TestCase):
         Test that when a parameter is only available on one of the levels that no times are returned.
         """
         req = DAL.newDataRequest('grid')
-        req.setLocationNames('RAP13')
+        req.setLocationNames('RUC130')
         req.setParameters('T','GH', 'LgSP1hr')
         req.setLevels('300MB', '500MB','700MB','0.0SFC')
         times = CTQ.getAvailableTimes(req);

pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 from shapely.geometry import box
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testFfmp.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testGfe.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testGrid.py

@@ -21,8 +21,8 @@
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from shapely.geometry import box, Point
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testHydro.py

@@ -20,8 +20,8 @@
 
 from __future__ import print_function
 import datetime
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange

pythonPackages/ufpy/test/dafTests/testLdadMesonet.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 from shapely.geometry import Polygon
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testMaps.py

@@ -20,8 +20,8 @@
 
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testModelSounding.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testObs.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testPirep.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testPracticeWarning.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import testWarning

pythonPackages/ufpy/test/dafTests/testProfiler.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testRadar.py

@@ -21,8 +21,8 @@
 from __future__ import print_function
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 from shapely.geometry import box
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import baseDafTestCase
 import unittest

pythonPackages/ufpy/test/dafTests/testRadarSpatial.py

@@ -20,7 +20,7 @@
 
 from __future__ import print_function
 from shapely.geometry import box
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testSatellite.py

@@ -20,7 +20,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testSfcObs.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/dafTests/testTopo.py

@@ -19,8 +19,8 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
-from awips.ThriftClient import ThriftRequestException
+from ufpy.ThriftClient import ThriftRequestException
 
 import baseDafTestCase
 import shapely.geometry

pythonPackages/ufpy/test/dafTests/testWarning.py

@@ -19,7 +19,7 @@
 ##
 
 from __future__ import print_function
-from awips.dataaccess import DataAccessLayer as DAL
+from ufpy.dataaccess import DataAccessLayer as DAL
 
 from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint
 import baseDafTestCase

pythonPackages/ufpy/test/testQpidTimeToLive.py

@@ -52,7 +52,7 @@ class ListenThread(threading.Thread):
         threading.Thread.__init__(self)
     
     def run(self):
-        from awips import QpidSubscriber
+        from ufpy import QpidSubscriber
         self.qs = QpidSubscriber.QpidSubscriber(self.hostname, self.portNumber, True)        
         self.qs.topicSubscribe(self.topicName, self.receivedMessage)