Replaced deprecated @abstractproperty decorator that was causing lint errors

Following these instructions: https://docs.python.org/3/library/abc.html#abc.abstractproperty

PiperOrigin-RevId: 480906718
Change-Id: I7c9a9754a4da2c30fcc94841bf728dbb229d1b5a

Author: DeepMind

dm_control/_render/executor/render_executor.py

@@ -96,11 +96,13 @@ def execution_context(self):
   def terminated(self):
     return self._terminated
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def thread(self):
     pass
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def _lock_if_necessary(self):
     pass
 

dm_control/composer/entity.py

@@ -172,19 +172,23 @@ def add_observable(self, name, observable, enabled=True):
 class FreePropObservableMixin(metaclass=abc.ABCMeta):
   """Enforce observables of a free-moving object."""
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def position(self):
     pass
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def orientation(self):
     pass
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def linear_velocity(self):
     pass
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def angular_velocity(self):
     pass
 
@@ -284,7 +288,8 @@ def after_step(self, physics, random_state):
     """Callback executed after an agent control step."""
     pass
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def mjcf_model(self):
     raise NotImplementedError
 

dm_control/composer/robot.py

@@ -26,7 +26,8 @@
 class Robot(entity.Entity, metaclass=abc.ABCMeta):
   """The abstract base class for robots."""
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def actuators(self):
     """Returns the actuator elements of the robot."""
     raise NotImplementedError

dm_control/entities/manipulators/base.py

@@ -150,12 +150,14 @@ def set_site_to_xpos(self, physics, random_state, site, target_pos,
 
     return success
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def joints(self):
     """Returns the joint elements of the arm."""
     raise NotImplementedError
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def wrist_site(self):
     """Returns the wrist site element of the arm."""
     raise NotImplementedError
@@ -188,6 +190,7 @@ def set_grasp(self, physics, close_factors):
         number is specified, the same position is applied to all fingers.
     """
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def tool_center_point(self):
     """Returns the tool center point element of the hand."""

dm_control/locomotion/arenas/corridors.py

@@ -35,15 +35,18 @@ class Corridor(composer.Arena, metaclass=abc.ABCMeta):
   def regenerate(self, random_state):
     raise NotImplementedError
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def corridor_length(self):
     raise NotImplementedError
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def corridor_width(self):
     raise NotImplementedError
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def ground_geoms(self):
     raise NotImplementedError
 
@@ -175,6 +178,7 @@ def ground_geoms(self):
 class GapsCorridor(EmptyCorridor):
   """A corridor that consists of multiple platforms separated by gaps."""
 
+  # pylint: disable=arguments-renamed
   def _build(self,
              platform_length=1.,
              gap_length=2.5,
@@ -236,6 +240,8 @@ def _build(self,
 
     self._ground_body = self._mjcf_root.worldbody.add('body', name='ground')
 
+  # pylint: enable=arguments-renamed
+
   def regenerate(self, random_state):
     """Regenerates this corridor.
 
@@ -334,6 +340,7 @@ def ground_geoms(self):
 class WallsCorridor(EmptyCorridor):
   """A corridor obstructed by multiple walls aligned against the two sides."""
 
+  # pylint: disable=arguments-renamed
   def _build(self,
              wall_gap=2.5,
              wall_width=2.5,
@@ -382,6 +389,8 @@ def _build(self,
     self._swap_wall_side = swap_wall_side
     self._include_initial_padding = include_initial_padding
 
+  # pylint: enable=arguments-renamed
+
   def regenerate(self, random_state):
     """Regenerates this corridor.
 

dm_control/locomotion/tasks/reference_pose/tracking.py

@@ -800,7 +800,8 @@ def action_spec(self, physics: 'mjcf.Physics'):
         name='\t'.join(actuator.full_identifier  # pytype: disable=attribute-error
                        for actuator in self._walker.actuators))
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def name(self):
     raise NotImplementedError
 

dm_control/locomotion/walkers/cmu_humanoid.py

@@ -235,7 +235,8 @@ def _build(self,
   def _build_observables(self):
     return CMUHumanoidObservables(self)
 
-  @abc.abstractproperty
+  @property
+  @abc.abstractmethod
   def _xml_path(self):
     raise NotImplementedError