handled merge conflicts

Author: daniel-sanche

packages/google-cloud-bigtable/google/cloud/bigtable/data/exceptions.py

@@ -141,11 +141,8 @@ def __repr__(self):
         return f"{self.__class__.__name__}({message!r}, {self.exceptions!r})"
 
 
-<<<<<<< HEAD
-=======
 # TODO: When working on mutations batcher, rework exception handling to guarantee that
 # MutationsExceptionGroup only stores FailedMutationEntryErrors.
->>>>>>> 80c350f891a (feat: Shimmed RowSet and RowRange for ReadRows. (#1296))
 class MutationsExceptionGroup(_BigtableExceptionGroup):
     """
     Represents one or more exceptions that occur during a bulk mutation operation

packages/google-cloud-bigtable/google/cloud/bigtable/row_filters.py

@@ -47,18 +47,14 @@
 from google.cloud.bigtable.data.row_filters import (
     ConditionalRowFilter as BaseConditionalRowFilter,
 )
-<<<<<<< HEAD
 from google.cloud.bigtable.data.row_filters import (
     TimestampRangeFilter as BaseTimestampRangeFilter,
 )
-=======
 from google.cloud.bigtable.helpers import _MappableAttributesMixin
->>>>>>> 80c350f891a (feat: Shimmed RowSet and RowRange for ReadRows. (#1296))
 
 _PACK_I64 = struct.Struct(">q").pack
 
 
-<<<<<<< HEAD
 def _deprecated_to_pb(self):
     import warnings
 
@@ -75,37 +71,6 @@ def _deprecated_to_pb(self):
 # Provide to_pb alias with DeprecationWarning for backwards compatibility with legacy client code
 RowFilter.to_pb = _deprecated_to_pb  # type: ignore[attr-defined]
 TimestampRange.to_pb = _deprecated_to_pb  # type: ignore[attr-defined]
-
-
-class _MappableAttributesMixin:
-    """
-    Mixin for classes that need some of their attribute names remapped.
-
-    This is for taking some of the classes from the data client row filters
-    that are 1:1 with their legacy client counterparts but with some of their
-    attributes renamed. To use in a class, override the base class with this mixin
-    class and define a map _attribute_map from legacy client attributes to data client
-    attributes.
-
-    Attributes are remapped and redefined in __init__ as well as getattr/setattr.
-    """
-
-    def __init__(self, *args, **kwargs):
-        new_kwargs = {self._attribute_map.get(k, k): v for (k, v) in kwargs.items()}
-        super(_MappableAttributesMixin, self).__init__(*args, **new_kwargs)
-
-    def __getattr__(self, name):
-        if name not in self._attribute_map:
-            raise AttributeError
-        return getattr(self, self._attribute_map[name])
-
-    def __setattr__(self, name, value):
-        attribute = self._attribute_map.get(name, name)
-        super(_MappableAttributesMixin, self).__setattr__(attribute, value)
-
-
-=======
->>>>>>> 80c350f891a (feat: Shimmed RowSet and RowRange for ReadRows. (#1296))
 # The classes defined below are to provide constructors and members
 # that have an interface that does not match the one used by the data
 # client, for backwards compatibility purposes.

packages/google-cloud-bigtable/google/cloud/bigtable/row_set.py

@@ -15,10 +15,13 @@
 """User-friendly container for Google Cloud Bigtable RowSet"""
 
 from google.cloud._helpers import _to_bytes
+
 from google.cloud.bigtable.data.read_rows_query import (
-    RowRange as BaseRowRange,
     ReadRowsQuery,
 )
+from google.cloud.bigtable.data.read_rows_query import (
+    RowRange as BaseRowRange,
+)
 from google.cloud.bigtable.helpers import _MappableAttributesMixin
 
 

packages/google-cloud-bigtable/tests/unit/v2_client/test_row_set.py

@@ -48,41 +48,6 @@ def test_row_set__eq__type_differ():
     assert not (row_set1 == row_set2)
 
 
-<<<<<<< HEAD
-def test_row_set__eq__len_row_keys_differ():
-    from google.cloud.bigtable.row_set import RowSet
-
-    row_key1 = b"row_key1"
-    row_key2 = b"row_key1"
-
-    row_set1 = RowSet()
-    row_set2 = RowSet()
-
-    row_set1.add_row_key(row_key1)
-    row_set1.add_row_key(row_key2)
-    row_set2.add_row_key(row_key2)
-
-    assert not (row_set1 == row_set2)
-
-
-def test_row_set__eq__len_row_ranges_differ():
-    from google.cloud.bigtable.row_set import RowRange, RowSet
-
-    row_range1 = RowRange(b"row_key4", b"row_key9")
-    row_range2 = RowRange(b"row_key4", b"row_key9")
-
-    row_set1 = RowSet()
-    row_set2 = RowSet()
-
-    row_set1.add_row_range(row_range1)
-    row_set1.add_row_range(row_range2)
-    row_set2.add_row_range(row_range2)
-
-    assert not (row_set1 == row_set2)
-
-
-=======
->>>>>>> 80c350f891a (feat: Shimmed RowSet and RowRange for ReadRows. (#1296))
 def test_row_set__eq__row_keys_differ():
     from google.cloud.bigtable.row_set import RowSet