#6322 Fix Python 3.8 problems

* Change base PdmObject class name to PdmObjectBase to avoid name conflicts
* Make all import paths relative
This commit is contained in:
Gaute Lindkvist
2020-08-19 07:30:51 +02:00
committed by Kristian Bendiksen
parent b741359696
commit 454e7f17a0
15 changed files with 390 additions and 443 deletions

View File

@@ -2,12 +2,11 @@
ResInsight Well Log Plot plot module
"""
import rips.generated.Commands_pb2 as Cmd
import Commands_pb2
from rips.plot import Plot
from rips.pdmobject import PdmObject
from rips.generated.pdm_objects import WellLogPlot
from rips.pdmobject import add_method
from .plot import Plot
from .pdmobject import PdmObjectBase, add_method
from pdm_objects import WellLogPlot
@add_method(WellLogPlot)
@@ -24,7 +23,7 @@ def export_data_as_las(self, export_folder, file_prefix='', export_tvdrkb=False,
Returns:
A list of files exported
"""
res = self._execute_command(exportWellLogPlotData=Cmd.ExportWellLogPlotDataRequest(exportFormat='LAS',
res = self._execute_command(exportWellLogPlotData=Commands_pb2.ExportWellLogPlotDataRequest(exportFormat='LAS',
viewId=self.id,
exportFolder=export_folder,
filePrefix=file_prefix,
@@ -47,7 +46,7 @@ def export_data_as_ascii(self, export_folder, file_prefix='', capitalize_file_na
Returns:
A list of files exported
"""
res = self._execute_command(exportWellLogPlotData=Cmd.ExportWellLogPlotDataRequest(exportFormat='ASCII',
res = self._execute_command(exportWellLogPlotData=Commands_pb2.ExportWellLogPlotDataRequest(exportFormat='ASCII',
viewId=self.id,
exportFolder=export_folder,
filePrefix=file_prefix,