#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

@@ -1,11 +1,11 @@
"""
ResInsight 3d contour map module
"""
import rips.generated.Commands_pb2 as Cmd
import Commands_pb2
from rips.pdmobject import PdmObject, add_method
from rips.view import View
from rips.generated.pdm_objects import EclipseContourMap, GeoMechContourMap
from .pdmobject import add_method
from .view import View
from pdm_objects import EclipseContourMap, GeoMechContourMap
@add_method(EclipseContourMap)
@@ -19,7 +19,7 @@ def export_to_text(self, export_file_name='', export_local_coordinates=False, un
exclude_undefined_values(bool): Skip undefined values.
"""
return self._execute_command(
exportContourMapToText=Cmd.ExportContourMapToTextRequest(
exportContourMapToText=Commands_pb2.ExportContourMapToTextRequest(
exportFileName=export_file_name,
exportLocalCoordinates=export_local_coordinates,
undefinedValueLabel=undefined_value_label,
@@ -38,7 +38,7 @@ def export_to_text(self, export_file_name='', export_local_coordinates=False, un
exclude_undefined_values(bool): Skip undefined values.
"""
return self._execute_command(
exportContourMapToText=Cmd.ExportContourMapToTextRequest(
exportContourMapToText=Commands_pb2.ExportContourMapToTextRequest(
exportFileName=export_file_name,
exportLocalCoordinates=export_local_coordinates,
undefinedValueLabel=undefined_value_label,