Skip to content

Remove reference to google._upb._message.RepeatedScalarContainer #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkebinger merged 2 commits into from
Feb 7, 2025
Merged

Remove reference to google._upb._message.RepeatedScalarContainer #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87fbc1
Remove reference to google._upb._message.RepeatedScalarContainer
jkebinger Feb 7, 2025
e84bf4c
Check for sequence while excluding str, bytes too
jkebinger Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions prefab_cloud_python/config_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations
import functools
from collections.abc import Sequence

from .read_write_lock import ReadWriteLock
from .config_value_unwrapper import ConfigValueUnwrapper
Expand All @@ -13,7 +14,6 @@
RegexMatchOperators,
)
import prefab_pb2 as Prefab
import google

logger = InternalLogger(__name__)

Expand Down Expand Up @@ -176,11 +176,11 @@ def negate(negate, value):

@staticmethod
def _ensure_list(value):
return (
value
if isinstance(value, (list, google._upb._message.RepeatedScalarContainer))
else [value]
)
if isinstance(value, list):
return value
if isinstance(value, Sequence) and not isinstance(value, (str, bytes)):
return list(value) # Convert other sequences to lists
return [value] # Wrap everything else in a list

def one_of(self, criterion, value, properties):
criterion_value_or_values = ConfigValueUnwrapper.deepest_value(
Expand Down
Loading