RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/protocolbuffers/protobuf/commit/f69180a6c13be76254e94548adea9d347c3707a6 below:

Remove calls to Label within Protobuf Python. · protocolbuffers/protobuf@f69180a · GitHub

File tree Expand file treeCollapse file tree 11 files changed

+28

-26

lines changed

Filter options

Expand file treeCollapse file tree 11 files changed

+28

-26

lines changed Original file line number Diff line number Diff line change


 @@ -75,7 +75,8 @@ def _IsMessageSetExtension(field):

75 75


 field.containing_type.has_options and

76 76


 field.containing_type.GetOptions().message_set_wire_format and

77 77


 field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and

78

-
 field.label == descriptor.FieldDescriptor.LABEL_OPTIONAL)

78

+
 not field.is_required and

79

+
 not field.is_repeated)

79 80 80 81


 _edition_defaults_lock = threading.Lock()

81 82 Original file line number Diff line number Diff line change


 @@ -329,7 +329,7 @@ def testFindFieldByName(self):

329 329


 field = self.pool.FindFieldByName(

330 330


 'google.protobuf.python.internal.Factory1Message.list_value')

331 331


 self.assertEqual(field.name, 'list_value')

332

-
 self.assertEqual(field.label, field.LABEL_REPEATED)

332

+
 self.assertTrue(field.is_repeated)

333 333


 self.assertFalse(field.has_options)

334 334 335 335


 with self.assertRaises(KeyError):

Original file line number Diff line number Diff line change


 @@ -61,7 +61,7 @@ def __getitem__(self, extension_handle):

61 61


 if result is not None:

62 62


 return result

63 63 64

-
 if extension_handle.label == FieldDescriptor.LABEL_REPEATED:

64

+
 if extension_handle.is_repeated:

65 65


 result = extension_handle._default_constructor(self._extended_message)

66 66


 elif extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:

67 67


 message_type = extension_handle.message_type


 @@ -129,7 +129,7 @@ def __setitem__(self, extension_handle, value):

129 129 130 130


 _VerifyExtensionHandle(self._extended_message, extension_handle)

131 131 132

-
 if (extension_handle.label == FieldDescriptor.LABEL_REPEATED or

132

+
 if (extension_handle.is_repeated or

133 133


 extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE):

134 134


 raise TypeError(

135 135


 'Cannot assign to extension "%s" because it is a repeated or '


 @@ -183,7 +183,7 @@ def __contains__(self, extension_handle):

183 183


 if extension_handle not in self._extended_message._fields:

184 184


 return False

185 185 186

-
 if extension_handle.label == FieldDescriptor.LABEL_REPEATED:

186

+
 if extension_handle.is_repeated:

187 187


 return bool(self._extended_message._fields.get(extension_handle))

188 188 189 189


 if extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:

Original file line number Diff line number Diff line change


 @@ -100,7 +100,7 @@ def _IsValidPath(message_descriptor, path):

100 100


 for name in parts:

101 101


 field = message_descriptor.fields_by_name.get(name)

102 102


 if (field is None or

103

-
 field.label == FieldDescriptor.LABEL_REPEATED or

103

+
 field.is_repeated or

104 104


 field.type != FieldDescriptor.TYPE_MESSAGE):

105 105


 return False

106 106


 message_descriptor = field.message_type


 @@ -271,7 +271,7 @@ def _MergeMessage(

271 271


 name, source_descriptor.full_name))

272 272


 if child:

273 273


 # Sub-paths are only allowed for singular message fields.

274

-
 if (field.label == FieldDescriptor.LABEL_REPEATED or

274

+
 if (field.is_repeated or

275 275


 field.cpp_type != FieldDescriptor.CPPTYPE_MESSAGE):

276 276


 raise ValueError('Error: Field {0} in message {1} is not a singular '

277 277


 'message field and cannot have sub-fields.'.format(


 @@ -281,7 +281,7 @@ def _MergeMessage(

281 281


 child, getattr(source, name), getattr(destination, name),

282 282


 replace_message, replace_repeated)

283 283


 continue

284

-
 if field.label == FieldDescriptor.LABEL_REPEATED:

284

+
 if field.is_repeated:

285 285


 if replace_repeated:

286 286


 destination.ClearField(_StrConvert(name))

287 287


 repeated_source = getattr(source, name)

Original file line number Diff line number Diff line change


 @@ -193,7 +193,7 @@ def testMergeMessageWithoutMapFields(self):

193 193


 mask.MergeMessage(src, dst)

194 194


 # The expected result message.

195 195


 msg = unittest_pb2.TestAllTypes()

196

-
 if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:

196

+
 if field.is_repeated:

197 197


 repeated_src = getattr(src, field_name)

198 198


 repeated_msg = getattr(msg, field_name)

199 199


 if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:

Original file line number Diff line number Diff line change


 @@ -1905,7 +1905,7 @@ def testProto3Optional(self):

1905 1905


 if field.name.startswith('optional_'):

1906 1906


 self.assertTrue(field.has_presence)

1907 1907


 for field in unittest_pb2.TestAllTypes.DESCRIPTOR.fields:

1908

-
 if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:

1908

+
 if field.is_repeated:

1909 1909


 self.assertFalse(field.has_presence)

1910 1910


 else:

1911 1911


 self.assertTrue(field.has_presence)

Original file line number Diff line number Diff line change


 @@ -256,7 +256,8 @@ def _IsMessageSetExtension(field):

256 256


 field.containing_type.has_options and

257 257


 field.containing_type.GetOptions().message_set_wire_format and

258 258


 field.type == _FieldDescriptor.TYPE_MESSAGE and

259

-
 field.label == _FieldDescriptor.LABEL_OPTIONAL)

259

+
 not field.is_required and

260

+
 not field.is_repeated)

260 261 261 262 262 263


 def _IsMapField(field):


 @@ -1260,7 +1261,7 @@ def _AddIsInitializedMethod(message_descriptor, cls):

1260 1261


  protocol message class."""

1261 1262 1262 1263


 required_fields = [field for field in message_descriptor.fields

1263

-
 if field.label == _FieldDescriptor.LABEL_REQUIRED]

1264

+
 if field.is_required]

1264 1265 1265 1266


 def IsInitialized(self, errors=None):

1266 1267


 """Checks if all required fields of a message are set.

Original file line number Diff line number Diff line change


 @@ -3286,9 +3286,8 @@ def testPackedOptions(self):

3286 3286


 proto.packed_int32.append(1)

3287 3287


 proto.packed_double.append(3.0)

3288 3288


 for field_descriptor, _ in proto.ListFields():

3289

-
 self.assertEqual(True, field_descriptor.is_packed)

3290

-
 self.assertEqual(descriptor.FieldDescriptor.LABEL_REPEATED,

3291

-
 field_descriptor.label)

3289

+
 self.assertTrue(field_descriptor.is_packed)

3290

+
 self.assertTrue(field_descriptor.is_repeated)

3292 3291 3293 3292 3294 3293


 @testing_refleaks.TestCase

Original file line number Diff line number Diff line change


 @@ -183,7 +183,7 @@ def CheckUnknownField(self, name, unknown_field_set, expected_value):

183 183


 continue

184 184


 if expected_type == wire_format.WIRETYPE_LENGTH_DELIMITED:

185 185


 self.assertIn(type(unknown_field.data), (str, bytes))

186

-
 if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:

186

+
 if field_descriptor.is_repeated:

187 187


 self.assertIn(unknown_field.data, expected_value)

188 188


 else:

189 189


 self.assertEqual(expected_value, unknown_field.data)


 @@ -362,11 +362,11 @@ def CheckUnknownField(self, name, expected_value):

362 362


 for field in unknown_field_set:

363 363


 if field.field_number == field_descriptor.number:

364 364


 count += 1

365

-
 if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:

365

+
 if field_descriptor.is_repeated:

366 366


 self.assertIn(field.data, expected_value)

367 367


 else:

368 368


 self.assertEqual(expected_value, field.data)

369

-
 if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:

369

+
 if field_descriptor.is_repeated:

370 370


 self.assertEqual(count, len(expected_value))

371 371


 else:

372 372


 self.assertEqual(count, 1)

Original file line number Diff line number Diff line change


 @@ -236,7 +236,7 @@ def _RegularMessageToJsonObject(self, message, js):

236 236


 recorded_key = str(key)

237 237


 js_map[recorded_key] = self._FieldToJsonObject(v_field, value[key])

238 238


 js[name] = js_map

239

-
 elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:

239

+
 elif field.is_repeated:

240 240


 # Convert a repeated field.

241 241


 js[name] = [self._FieldToJsonObject(field, k) for k in value]

242 242


 elif field.is_extension:


 @@ -266,7 +266,7 @@ def _RegularMessageToJsonObject(self, message, js):

266 266


 continue

267 267


 if _IsMapEntry(field):

268 268


 js[name] = {}

269

-
 elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:

269

+
 elif field.is_repeated:

270 270


 js[name] = []

271 271


 else:

272 272


 js[name] = self._FieldToJsonObject(field, field.default_value)


 @@ -636,7 +636,7 @@ def _ConvertFieldValuePair(self, js, message, path):

636 636


 self._ConvertMapFieldValue(

637 637


 value, message, field, '{0}.{1}'.format(path, name)

638 638

639

-
 elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:

639

+
 elif field.is_repeated:

640 640


 message.ClearField(field.name)

641 641


 if not isinstance(value, _LIST_LIKE):

642 642


 raise ParseError(

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4