Skip to content
This repository was archived by the owner on Mar 26, 2026. It is now read-only.

Commit 2215ac1

Browse files
ohmayrohmayr
committed
fix line length
1 parent 27d0819 commit 2215ac1

11 files changed

Lines changed: 110 additions & 0 deletions

File tree

‎tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
106106
Returns:
107107
AssetServiceAsyncClient: The constructed client.
108108
"""
109+
<<<<<<< HEAD
109110
<<<<<<< HEAD
110111
sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore
111112
return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs)
112113
=======
113114
return AssetServiceClient.from_service_account_info.__func__(AssetServiceAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
114115
>>>>>>> 70d9f452 (update goldens)
116+
=======
117+
sa_info_func = AssetServiceClient.from_service_account_info.__func__ # type: ignore
118+
return sa_info_func(AssetServiceAsyncClient, info, *args, **kwargs)
119+
>>>>>>> 10a19604 (fix line length)
115120

116121
@classmethod
117122
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -127,12 +132,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
127132
Returns:
128133
AssetServiceAsyncClient: The constructed client.
129134
"""
135+
<<<<<<< HEAD
130136
<<<<<<< HEAD
131137
sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore
132138
return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs)
133139
=======
134140
return AssetServiceClient.from_service_account_file.__func__(AssetServiceAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
135141
>>>>>>> 70d9f452 (update goldens)
142+
=======
143+
sa_file_func = AssetServiceClient.from_service_account_file.__func__ # type: ignore
144+
return sa_file_func(AssetServiceAsyncClient, filename, *args, **kwargs)
145+
>>>>>>> 10a19604 (fix line length)
136146

137147
from_service_account_json = from_service_account_file
138148

‎tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9797
Returns:
9898
IAMCredentialsAsyncClient: The constructed client.
9999
"""
100+
<<<<<<< HEAD
100101
<<<<<<< HEAD
101102
sa_info_func = IAMCredentialsClient.from_service_account_info.__func__ # type: ignore
102103
return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs)
103104
=======
104105
return IAMCredentialsClient.from_service_account_info.__func__(IAMCredentialsAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
105106
>>>>>>> 70d9f452 (update goldens)
107+
=======
108+
sa_info_func = IAMCredentialsClient.from_service_account_info.__func__ # type: ignore
109+
return sa_info_func(IAMCredentialsAsyncClient, info, *args, **kwargs)
110+
>>>>>>> 10a19604 (fix line length)
106111

107112
@classmethod
108113
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -118,12 +123,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
118123
Returns:
119124
IAMCredentialsAsyncClient: The constructed client.
120125
"""
126+
<<<<<<< HEAD
121127
<<<<<<< HEAD
122128
sa_file_func = IAMCredentialsClient.from_service_account_file.__func__ # type: ignore
123129
return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs)
124130
=======
125131
return IAMCredentialsClient.from_service_account_file.__func__(IAMCredentialsAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
126132
>>>>>>> 70d9f452 (update goldens)
133+
=======
134+
sa_file_func = IAMCredentialsClient.from_service_account_file.__func__ # type: ignore
135+
return sa_file_func(IAMCredentialsAsyncClient, filename, *args, **kwargs)
136+
>>>>>>> 10a19604 (fix line length)
127137

128138
from_service_account_json = from_service_account_file
129139

‎tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
124124
Returns:
125125
EventarcAsyncClient: The constructed client.
126126
"""
127+
<<<<<<< HEAD
127128
<<<<<<< HEAD
128129
sa_info_func = EventarcClient.from_service_account_info.__func__ # type: ignore
129130
return sa_info_func(EventarcAsyncClient, info, *args, **kwargs)
130131
=======
131132
return EventarcClient.from_service_account_info.__func__(EventarcAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
132133
>>>>>>> 70d9f452 (update goldens)
134+
=======
135+
sa_info_func = EventarcClient.from_service_account_info.__func__ # type: ignore
136+
return sa_info_func(EventarcAsyncClient, info, *args, **kwargs)
137+
>>>>>>> 10a19604 (fix line length)
133138

134139
@classmethod
135140
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -145,12 +150,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
145150
Returns:
146151
EventarcAsyncClient: The constructed client.
147152
"""
153+
<<<<<<< HEAD
148154
<<<<<<< HEAD
149155
sa_file_func = EventarcClient.from_service_account_file.__func__ # type: ignore
150156
return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs)
151157
=======
152158
return EventarcClient.from_service_account_file.__func__(EventarcAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
153159
>>>>>>> 70d9f452 (update goldens)
160+
=======
161+
sa_file_func = EventarcClient.from_service_account_file.__func__ # type: ignore
162+
return sa_file_func(EventarcAsyncClient, filename, *args, **kwargs)
163+
>>>>>>> 10a19604 (fix line length)
154164

155165
from_service_account_json = from_service_account_file
156166

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
104104
Returns:
105105
ConfigServiceV2AsyncClient: The constructed client.
106106
"""
107+
<<<<<<< HEAD
107108
<<<<<<< HEAD
108109
sa_info_func = ConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
109110
return sa_info_func(ConfigServiceV2AsyncClient, info, *args, **kwargs)
110111
=======
111112
return ConfigServiceV2Client.from_service_account_info.__func__(ConfigServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
112113
>>>>>>> 70d9f452 (update goldens)
114+
=======
115+
sa_info_func = ConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
116+
return sa_info_func(ConfigServiceV2AsyncClient, info, *args, **kwargs)
117+
>>>>>>> 10a19604 (fix line length)
113118

114119
@classmethod
115120
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -125,12 +130,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
125130
Returns:
126131
ConfigServiceV2AsyncClient: The constructed client.
127132
"""
133+
<<<<<<< HEAD
128134
<<<<<<< HEAD
129135
sa_file_func = ConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
130136
return sa_file_func(ConfigServiceV2AsyncClient, filename, *args, **kwargs)
131137
=======
132138
return ConfigServiceV2Client.from_service_account_file.__func__(ConfigServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
133139
>>>>>>> 70d9f452 (update goldens)
140+
=======
141+
sa_file_func = ConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
142+
return sa_file_func(ConfigServiceV2AsyncClient, filename, *args, **kwargs)
143+
>>>>>>> 10a19604 (fix line length)
134144

135145
from_service_account_json = from_service_account_file
136146

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
8989
Returns:
9090
LoggingServiceV2AsyncClient: The constructed client.
9191
"""
92+
<<<<<<< HEAD
9293
<<<<<<< HEAD
9394
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
9495
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
9596
=======
9697
return LoggingServiceV2Client.from_service_account_info.__func__(LoggingServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
9798
>>>>>>> 70d9f452 (update goldens)
99+
=======
100+
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
101+
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
102+
>>>>>>> 10a19604 (fix line length)
98103

99104
@classmethod
100105
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -110,12 +115,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
110115
Returns:
111116
LoggingServiceV2AsyncClient: The constructed client.
112117
"""
118+
<<<<<<< HEAD
113119
<<<<<<< HEAD
114120
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
115121
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
116122
=======
117123
return LoggingServiceV2Client.from_service_account_file.__func__(LoggingServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
118124
>>>>>>> 70d9f452 (update goldens)
125+
=======
126+
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
127+
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
128+
>>>>>>> 10a19604 (fix line length)
119129

120130
from_service_account_json = from_service_account_file
121131

‎tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9090
Returns:
9191
MetricsServiceV2AsyncClient: The constructed client.
9292
"""
93+
<<<<<<< HEAD
9394
<<<<<<< HEAD
9495
sa_info_func = MetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
9596
return sa_info_func(MetricsServiceV2AsyncClient, info, *args, **kwargs)
9697
=======
9798
return MetricsServiceV2Client.from_service_account_info.__func__(MetricsServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
9899
>>>>>>> 70d9f452 (update goldens)
100+
=======
101+
sa_info_func = MetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
102+
return sa_info_func(MetricsServiceV2AsyncClient, info, *args, **kwargs)
103+
>>>>>>> 10a19604 (fix line length)
99104

100105
@classmethod
101106
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -111,12 +116,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
111116
Returns:
112117
MetricsServiceV2AsyncClient: The constructed client.
113118
"""
119+
<<<<<<< HEAD
114120
<<<<<<< HEAD
115121
sa_file_func = MetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
116122
return sa_file_func(MetricsServiceV2AsyncClient, filename, *args, **kwargs)
117123
=======
118124
return MetricsServiceV2Client.from_service_account_file.__func__(MetricsServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
119125
>>>>>>> 70d9f452 (update goldens)
126+
=======
127+
sa_file_func = MetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
128+
return sa_file_func(MetricsServiceV2AsyncClient, filename, *args, **kwargs)
129+
>>>>>>> 10a19604 (fix line length)
120130

121131
from_service_account_json = from_service_account_file
122132

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/config_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
104104
Returns:
105105
BaseConfigServiceV2AsyncClient: The constructed client.
106106
"""
107+
<<<<<<< HEAD
107108
<<<<<<< HEAD
108109
sa_info_func = BaseConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
109110
return sa_info_func(BaseConfigServiceV2AsyncClient, info, *args, **kwargs)
110111
=======
111112
return BaseConfigServiceV2Client.from_service_account_info.__func__(BaseConfigServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
112113
>>>>>>> 70d9f452 (update goldens)
114+
=======
115+
sa_info_func = BaseConfigServiceV2Client.from_service_account_info.__func__ # type: ignore
116+
return sa_info_func(BaseConfigServiceV2AsyncClient, info, *args, **kwargs)
117+
>>>>>>> 10a19604 (fix line length)
113118

114119
@classmethod
115120
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -125,12 +130,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
125130
Returns:
126131
BaseConfigServiceV2AsyncClient: The constructed client.
127132
"""
133+
<<<<<<< HEAD
128134
<<<<<<< HEAD
129135
sa_file_func = BaseConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
130136
return sa_file_func(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs)
131137
=======
132138
return BaseConfigServiceV2Client.from_service_account_file.__func__(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
133139
>>>>>>> 70d9f452 (update goldens)
140+
=======
141+
sa_file_func = BaseConfigServiceV2Client.from_service_account_file.__func__ # type: ignore
142+
return sa_file_func(BaseConfigServiceV2AsyncClient, filename, *args, **kwargs)
143+
>>>>>>> 10a19604 (fix line length)
134144

135145
from_service_account_json = from_service_account_file
136146

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/logging_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
8989
Returns:
9090
LoggingServiceV2AsyncClient: The constructed client.
9191
"""
92+
<<<<<<< HEAD
9293
<<<<<<< HEAD
9394
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
9495
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
9596
=======
9697
return LoggingServiceV2Client.from_service_account_info.__func__(LoggingServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
9798
>>>>>>> 70d9f452 (update goldens)
99+
=======
100+
sa_info_func = LoggingServiceV2Client.from_service_account_info.__func__ # type: ignore
101+
return sa_info_func(LoggingServiceV2AsyncClient, info, *args, **kwargs)
102+
>>>>>>> 10a19604 (fix line length)
98103

99104
@classmethod
100105
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -110,12 +115,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
110115
Returns:
111116
LoggingServiceV2AsyncClient: The constructed client.
112117
"""
118+
<<<<<<< HEAD
113119
<<<<<<< HEAD
114120
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
115121
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
116122
=======
117123
return LoggingServiceV2Client.from_service_account_file.__func__(LoggingServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
118124
>>>>>>> 70d9f452 (update goldens)
125+
=======
126+
sa_file_func = LoggingServiceV2Client.from_service_account_file.__func__ # type: ignore
127+
return sa_file_func(LoggingServiceV2AsyncClient, filename, *args, **kwargs)
128+
>>>>>>> 10a19604 (fix line length)
119129

120130
from_service_account_json = from_service_account_file
121131

‎tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
9090
Returns:
9191
BaseMetricsServiceV2AsyncClient: The constructed client.
9292
"""
93+
<<<<<<< HEAD
9394
<<<<<<< HEAD
9495
sa_info_func = BaseMetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
9596
return sa_info_func(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs)
9697
=======
9798
return BaseMetricsServiceV2Client.from_service_account_info.__func__(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
9899
>>>>>>> 70d9f452 (update goldens)
100+
=======
101+
sa_info_func = BaseMetricsServiceV2Client.from_service_account_info.__func__ # type: ignore
102+
return sa_info_func(BaseMetricsServiceV2AsyncClient, info, *args, **kwargs)
103+
>>>>>>> 10a19604 (fix line length)
99104

100105
@classmethod
101106
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -111,12 +116,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
111116
Returns:
112117
BaseMetricsServiceV2AsyncClient: The constructed client.
113118
"""
119+
<<<<<<< HEAD
114120
<<<<<<< HEAD
115121
sa_file_func = BaseMetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
116122
return sa_file_func(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs)
117123
=======
118124
return BaseMetricsServiceV2Client.from_service_account_file.__func__(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
119125
>>>>>>> 70d9f452 (update goldens)
126+
=======
127+
sa_file_func = BaseMetricsServiceV2Client.from_service_account_file.__func__ # type: ignore
128+
return sa_file_func(BaseMetricsServiceV2AsyncClient, filename, *args, **kwargs)
129+
>>>>>>> 10a19604 (fix line length)
120130

121131
from_service_account_json = from_service_account_file
122132

‎tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/async_client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,17 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
114114
Returns:
115115
CloudRedisAsyncClient: The constructed client.
116116
"""
117+
<<<<<<< HEAD
117118
<<<<<<< HEAD
118119
sa_info_func = CloudRedisClient.from_service_account_info.__func__ # type: ignore
119120
return sa_info_func(CloudRedisAsyncClient, info, *args, **kwargs)
120121
=======
121122
return CloudRedisClient.from_service_account_info.__func__(CloudRedisAsyncClient, info, *args, **kwargs) # type: ignore # fmt: skip
122123
>>>>>>> 70d9f452 (update goldens)
124+
=======
125+
sa_info_func = CloudRedisClient.from_service_account_info.__func__ # type: ignore
126+
return sa_info_func(CloudRedisAsyncClient, info, *args, **kwargs)
127+
>>>>>>> 10a19604 (fix line length)
123128

124129
@classmethod
125130
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -135,12 +140,17 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
135140
Returns:
136141
CloudRedisAsyncClient: The constructed client.
137142
"""
143+
<<<<<<< HEAD
138144
<<<<<<< HEAD
139145
sa_file_func = CloudRedisClient.from_service_account_file.__func__ # type: ignore
140146
return sa_file_func(CloudRedisAsyncClient, filename, *args, **kwargs)
141147
=======
142148
return CloudRedisClient.from_service_account_file.__func__(CloudRedisAsyncClient, filename, *args, **kwargs) # type: ignore # fmt: skip
143149
>>>>>>> 70d9f452 (update goldens)
150+
=======
151+
sa_file_func = CloudRedisClient.from_service_account_file.__func__ # type: ignore
152+
return sa_file_func(CloudRedisAsyncClient, filename, *args, **kwargs)
153+
>>>>>>> 10a19604 (fix line length)
144154

145155
from_service_account_json = from_service_account_file
146156

0 commit comments

Comments
 (0)