[Python-modules-commits] [pychromecast] 02/04: Support protobuf 2

Ruben Undheim rubund-guest at moszumanska.debian.org
Fri May 6 20:13:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch before_protobuf3_in_debian
in repository pychromecast.

commit 3864e871565c332c7c68af366fb6b3e283b1a72f
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri May 6 20:11:07 2016 +0200

    Support protobuf 2
    
    This patch must be removed when python-protobuf 3 is in Debian.
    See http://bugs.debian.org/795841
---
 pychromecast/authority_keys_pb2.py | 118 ------
 pychromecast/cast_channel_pb2.py   | 250 ++++--------
 pychromecast/logging_pb2.py        | 809 -------------------------------------
 3 files changed, 80 insertions(+), 1097 deletions(-)

diff --git a/pychromecast/authority_keys_pb2.py b/pychromecast/authority_keys_pb2.py
deleted file mode 100644
index 82684c1..0000000
--- a/pychromecast/authority_keys_pb2.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: authority_keys.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='authority_keys.proto',
-  package='extensions.core_api.cast_channel.proto',
-  syntax='proto2',
-  serialized_pb=_b('\n\x14\x61uthority_keys.proto\x12&extensions.core_api.cast_channel.proto\"\x88\x01\n\rAuthorityKeys\x12G\n\x04keys\x18\x01 \x03(\x0b\x32\x39.extensions.core_api.cast_channel.proto.AuthorityKeys.Key\x1a.\n\x03Key\x12\x13\n\x0b\x66ingerprint\x18\x01 \x02(\x0c\x12\x12\n\npublic_key\x18\x02 \x02(\x0c\x42\x02H\x03')
-)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-
-
-_AUTHORITYKEYS_KEY = _descriptor.Descriptor(
-  name='Key',
-  full_name='extensions.core_api.cast_channel.proto.AuthorityKeys.Key',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='fingerprint', full_name='extensions.core_api.cast_channel.proto.AuthorityKeys.Key.fingerprint', index=0,
-      number=1, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='public_key', full_name='extensions.core_api.cast_channel.proto.AuthorityKeys.Key.public_key', index=1,
-      number=2, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=155,
-  serialized_end=201,
-)
-
-_AUTHORITYKEYS = _descriptor.Descriptor(
-  name='AuthorityKeys',
-  full_name='extensions.core_api.cast_channel.proto.AuthorityKeys',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='keys', full_name='extensions.core_api.cast_channel.proto.AuthorityKeys.keys', index=0,
-      number=1, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[_AUTHORITYKEYS_KEY, ],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  syntax='proto2',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=65,
-  serialized_end=201,
-)
-
-_AUTHORITYKEYS_KEY.containing_type = _AUTHORITYKEYS
-_AUTHORITYKEYS.fields_by_name['keys'].message_type = _AUTHORITYKEYS_KEY
-DESCRIPTOR.message_types_by_name['AuthorityKeys'] = _AUTHORITYKEYS
-
-AuthorityKeys = _reflection.GeneratedProtocolMessageType('AuthorityKeys', (_message.Message,), dict(
-
-  Key = _reflection.GeneratedProtocolMessageType('Key', (_message.Message,), dict(
-    DESCRIPTOR = _AUTHORITYKEYS_KEY,
-    __module__ = 'authority_keys_pb2'
-    # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.proto.AuthorityKeys.Key)
-    ))
-  ,
-  DESCRIPTOR = _AUTHORITYKEYS,
-  __module__ = 'authority_keys_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.proto.AuthorityKeys)
-  ))
-_sym_db.RegisterMessage(AuthorityKeys)
-_sym_db.RegisterMessage(AuthorityKeys.Key)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\003'))
-# @@protoc_insertion_point(module_scope)
diff --git a/pychromecast/cast_channel_pb2.py b/pychromecast/cast_channel_pb2.py
index 1893718..b9b084d 100644
--- a/pychromecast/cast_channel_pb2.py
+++ b/pychromecast/cast_channel_pb2.py
@@ -1,64 +1,25 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: cast_channel.proto
 
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
 from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
-_sym_db = _symbol_database.Default()
-
 
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='cast_channel.proto',
-  package='extensions.core_api.cast_channel',
-  syntax='proto2',
-  serialized_pb=_b('\n\x12\x63\x61st_channel.proto\x12 extensions.core_api.cast_channel\"\xed\x02\n\x0b\x43\x61stMessage\x12W\n\x10protocol_version\x18\x01 \x02(\x0e\x32=.extensions.core_api.cast_channel.CastMessage.ProtocolVersion\x12\x11\n\tsource_id\x18\x02 \x02(\t\x12\x16\n\x0e\x64\x65stination_id\x18\x03 \x02(\t\x12\x11\n\tnamespace\x18\x04 \x02(\t\x12O\n\x0cpayload_type\x18\x05 \x02(\x0e\x32\x39.extensions.core_api.cast_channel.CastMessage.PayloadType\x12\x14\n\x0cpayload_utf8\x18\ [...]
-)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+  package='extensions.api.cast_channel',
+  serialized_pb='\n\x12\x63\x61st_channel.proto\x12\x1b\x65xtensions.api.cast_channel\"\xe3\x02\n\x0b\x43\x61stMessage\x12R\n\x10protocol_version\x18\x01 \x02(\x0e\x32\x38.extensions.api.cast_channel.CastMessage.ProtocolVersion\x12\x11\n\tsource_id\x18\x02 \x02(\t\x12\x16\n\x0e\x64\x65stination_id\x18\x03 \x02(\t\x12\x11\n\tnamespace\x18\x04 \x02(\t\x12J\n\x0cpayload_type\x18\x05 \x02(\x0e\x32\x34.extensions.api.cast_channel.CastMessage.PayloadType\x12\x14\n\x0cpayload_utf8\x18\x06 \x01( [...]
 
-_SIGNATUREALGORITHM = _descriptor.EnumDescriptor(
-  name='SignatureAlgorithm',
-  full_name='extensions.core_api.cast_channel.SignatureAlgorithm',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='UNSPECIFIED', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='RSASSA_PKCS1v15', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='RSASSA_PSS', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=1131,
-  serialized_end=1205,
-)
-_sym_db.RegisterEnumDescriptor(_SIGNATUREALGORITHM)
-
-SignatureAlgorithm = enum_type_wrapper.EnumTypeWrapper(_SIGNATUREALGORITHM)
-UNSPECIFIED = 0
-RSASSA_PKCS1v15 = 1
-RSASSA_PSS = 2
 
 
 _CASTMESSAGE_PROTOCOLVERSION = _descriptor.EnumDescriptor(
   name='ProtocolVersion',
-  full_name='extensions.core_api.cast_channel.CastMessage.ProtocolVersion',
+  full_name='extensions.api.cast_channel.CastMessage.ProtocolVersion',
   filename=None,
   file=DESCRIPTOR,
   values=[
@@ -69,14 +30,13 @@ _CASTMESSAGE_PROTOCOLVERSION = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=350,
-  serialized_end=383,
+  serialized_start=335,
+  serialized_end=368,
 )
-_sym_db.RegisterEnumDescriptor(_CASTMESSAGE_PROTOCOLVERSION)
 
 _CASTMESSAGE_PAYLOADTYPE = _descriptor.EnumDescriptor(
   name='PayloadType',
-  full_name='extensions.core_api.cast_channel.CastMessage.PayloadType',
+  full_name='extensions.api.cast_channel.CastMessage.PayloadType',
   filename=None,
   file=DESCRIPTOR,
   values=[
@@ -91,14 +51,13 @@ _CASTMESSAGE_PAYLOADTYPE = _descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
-  serialized_start=385,
-  serialized_end=422,
+  serialized_start=370,
+  serialized_end=407,
 )
-_sym_db.RegisterEnumDescriptor(_CASTMESSAGE_PAYLOADTYPE)
 
 _AUTHERROR_ERRORTYPE = _descriptor.EnumDescriptor(
   name='ErrorType',
-  full_name='extensions.core_api.cast_channel.AuthError.ErrorType',
+  full_name='extensions.api.cast_channel.AuthError.ErrorType',
   filename=None,
   file=DESCRIPTOR,
   values=[
@@ -110,72 +69,67 @@ _AUTHERROR_ERRORTYPE = _descriptor.EnumDescriptor(
       name='NO_TLS', index=1, number=1,
       options=None,
       type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SIGNATURE_ALGORITHM_UNAVAILABLE', index=2, number=2,
-      options=None,
-      type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=833,
-  serialized_end=913,
+  serialized_start=577,
+  serialized_end=620,
 )
-_sym_db.RegisterEnumDescriptor(_AUTHERROR_ERRORTYPE)
 
 
 _CASTMESSAGE = _descriptor.Descriptor(
   name='CastMessage',
-  full_name='extensions.core_api.cast_channel.CastMessage',
+  full_name='extensions.api.cast_channel.CastMessage',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='protocol_version', full_name='extensions.core_api.cast_channel.CastMessage.protocol_version', index=0,
+      name='protocol_version', full_name='extensions.api.cast_channel.CastMessage.protocol_version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='source_id', full_name='extensions.core_api.cast_channel.CastMessage.source_id', index=1,
+      name='source_id', full_name='extensions.api.cast_channel.CastMessage.source_id', index=1,
       number=2, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='destination_id', full_name='extensions.core_api.cast_channel.CastMessage.destination_id', index=2,
+      name='destination_id', full_name='extensions.api.cast_channel.CastMessage.destination_id', index=2,
       number=3, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='namespace', full_name='extensions.core_api.cast_channel.CastMessage.namespace', index=3,
+      name='namespace', full_name='extensions.api.cast_channel.CastMessage.namespace', index=3,
       number=4, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='payload_type', full_name='extensions.core_api.cast_channel.CastMessage.payload_type', index=4,
+      name='payload_type', full_name='extensions.api.cast_channel.CastMessage.payload_type', index=4,
       number=5, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='payload_utf8', full_name='extensions.core_api.cast_channel.CastMessage.payload_utf8', index=5,
+      name='payload_utf8', full_name='extensions.api.cast_channel.CastMessage.payload_utf8', index=5,
       number=6, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='payload_binary', full_name='extensions.core_api.cast_channel.CastMessage.payload_binary', index=6,
+      name='payload_binary', full_name='extensions.api.cast_channel.CastMessage.payload_binary', index=6,
       number=7, type=12, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b(""),
+      has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -189,29 +143,19 @@ _CASTMESSAGE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
-  syntax='proto2',
   extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=57,
-  serialized_end=422,
+  serialized_start=52,
+  serialized_end=407,
 )
 
 
 _AUTHCHALLENGE = _descriptor.Descriptor(
   name='AuthChallenge',
-  full_name='extensions.core_api.cast_channel.AuthChallenge',
+  full_name='extensions.api.cast_channel.AuthChallenge',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
-    _descriptor.FieldDescriptor(
-      name='signature_algorithm', full_name='extensions.core_api.cast_channel.AuthChallenge.signature_algorithm', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      has_default_value=True, default_value=1,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
   ],
   extensions=[
   ],
@@ -220,47 +164,30 @@ _AUTHCHALLENGE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
-  syntax='proto2',
   extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=424,
-  serialized_end=539,
+  serialized_start=409,
+  serialized_end=424,
 )
 
 
 _AUTHRESPONSE = _descriptor.Descriptor(
   name='AuthResponse',
-  full_name='extensions.core_api.cast_channel.AuthResponse',
+  full_name='extensions.api.cast_channel.AuthResponse',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='signature', full_name='extensions.core_api.cast_channel.AuthResponse.signature', index=0,
+      name='signature', full_name='extensions.api.cast_channel.AuthResponse.signature', index=0,
       number=1, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b(""),
+      has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='client_auth_certificate', full_name='extensions.core_api.cast_channel.AuthResponse.client_auth_certificate', index=1,
+      name='client_auth_certificate', full_name='extensions.api.cast_channel.AuthResponse.client_auth_certificate', index=1,
       number=2, type=12, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b(""),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='intermediate_certificate', full_name='extensions.core_api.cast_channel.AuthResponse.intermediate_certificate', index=2,
-      number=3, type=12, cpp_type=9, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='signature_algorithm', full_name='extensions.core_api.cast_channel.AuthResponse.signature_algorithm', index=3,
-      number=4, type=14, cpp_type=8, label=1,
-      has_default_value=True, default_value=1,
+      has_default_value=False, default_value="",
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -272,24 +199,21 @@ _AUTHRESPONSE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
-  syntax='proto2',
   extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=542,
-  serialized_end=742,
+  serialized_start=426,
+  serialized_end=492,
 )
 
 
 _AUTHERROR = _descriptor.Descriptor(
   name='AuthError',
-  full_name='extensions.core_api.cast_channel.AuthError',
+  full_name='extensions.api.cast_channel.AuthError',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='error_type', full_name='extensions.core_api.cast_channel.AuthError.error_type', index=0,
+      name='error_type', full_name='extensions.api.cast_channel.AuthError.error_type', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
@@ -304,38 +228,35 @@ _AUTHERROR = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
-  syntax='proto2',
   extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=745,
-  serialized_end=913,
+  serialized_start=494,
+  serialized_end=620,
 )
 
 
 _DEVICEAUTHMESSAGE = _descriptor.Descriptor(
   name='DeviceAuthMessage',
-  full_name='extensions.core_api.cast_channel.DeviceAuthMessage',
+  full_name='extensions.api.cast_channel.DeviceAuthMessage',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='challenge', full_name='extensions.core_api.cast_channel.DeviceAuthMessage.challenge', index=0,
+      name='challenge', full_name='extensions.api.cast_channel.DeviceAuthMessage.challenge', index=0,
       number=1, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='response', full_name='extensions.core_api.cast_channel.DeviceAuthMessage.response', index=1,
+      name='response', full_name='extensions.api.cast_channel.DeviceAuthMessage.response', index=1,
       number=2, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='error', full_name='extensions.core_api.cast_channel.DeviceAuthMessage.error', index=2,
+      name='error', full_name='extensions.api.cast_channel.DeviceAuthMessage.error', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
@@ -349,22 +270,17 @@ _DEVICEAUTHMESSAGE = _descriptor.Descriptor(
   ],
   options=None,
   is_extendable=False,
-  syntax='proto2',
   extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=916,
-  serialized_end=1129,
+  serialized_start=623,
+  serialized_end=821,
 )
 
 _CASTMESSAGE.fields_by_name['protocol_version'].enum_type = _CASTMESSAGE_PROTOCOLVERSION
 _CASTMESSAGE.fields_by_name['payload_type'].enum_type = _CASTMESSAGE_PAYLOADTYPE
-_CASTMESSAGE_PROTOCOLVERSION.containing_type = _CASTMESSAGE
-_CASTMESSAGE_PAYLOADTYPE.containing_type = _CASTMESSAGE
-_AUTHCHALLENGE.fields_by_name['signature_algorithm'].enum_type = _SIGNATUREALGORITHM
-_AUTHRESPONSE.fields_by_name['signature_algorithm'].enum_type = _SIGNATUREALGORITHM
+_CASTMESSAGE_PROTOCOLVERSION.containing_type = _CASTMESSAGE;
+_CASTMESSAGE_PAYLOADTYPE.containing_type = _CASTMESSAGE;
 _AUTHERROR.fields_by_name['error_type'].enum_type = _AUTHERROR_ERRORTYPE
-_AUTHERROR_ERRORTYPE.containing_type = _AUTHERROR
+_AUTHERROR_ERRORTYPE.containing_type = _AUTHERROR;
 _DEVICEAUTHMESSAGE.fields_by_name['challenge'].message_type = _AUTHCHALLENGE
 _DEVICEAUTHMESSAGE.fields_by_name['response'].message_type = _AUTHRESPONSE
 _DEVICEAUTHMESSAGE.fields_by_name['error'].message_type = _AUTHERROR
@@ -373,44 +289,38 @@ DESCRIPTOR.message_types_by_name['AuthChallenge'] = _AUTHCHALLENGE
 DESCRIPTOR.message_types_by_name['AuthResponse'] = _AUTHRESPONSE
 DESCRIPTOR.message_types_by_name['AuthError'] = _AUTHERROR
 DESCRIPTOR.message_types_by_name['DeviceAuthMessage'] = _DEVICEAUTHMESSAGE
-DESCRIPTOR.enum_types_by_name['SignatureAlgorithm'] = _SIGNATUREALGORITHM
-
-CastMessage = _reflection.GeneratedProtocolMessageType('CastMessage', (_message.Message,), dict(
-  DESCRIPTOR = _CASTMESSAGE,
-  __module__ = 'cast_channel_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.CastMessage)
-  ))
-_sym_db.RegisterMessage(CastMessage)
-
-AuthChallenge = _reflection.GeneratedProtocolMessageType('AuthChallenge', (_message.Message,), dict(
-  DESCRIPTOR = _AUTHCHALLENGE,
-  __module__ = 'cast_channel_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.AuthChallenge)
-  ))
-_sym_db.RegisterMessage(AuthChallenge)
-
-AuthResponse = _reflection.GeneratedProtocolMessageType('AuthResponse', (_message.Message,), dict(
-  DESCRIPTOR = _AUTHRESPONSE,
-  __module__ = 'cast_channel_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.AuthResponse)
-  ))
-_sym_db.RegisterMessage(AuthResponse)
-
-AuthError = _reflection.GeneratedProtocolMessageType('AuthError', (_message.Message,), dict(
-  DESCRIPTOR = _AUTHERROR,
-  __module__ = 'cast_channel_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.AuthError)
-  ))
-_sym_db.RegisterMessage(AuthError)
-
-DeviceAuthMessage = _reflection.GeneratedProtocolMessageType('DeviceAuthMessage', (_message.Message,), dict(
-  DESCRIPTOR = _DEVICEAUTHMESSAGE,
-  __module__ = 'cast_channel_pb2'
-  # @@protoc_insertion_point(class_scope:extensions.core_api.cast_channel.DeviceAuthMessage)
-  ))
-_sym_db.RegisterMessage(DeviceAuthMessage)
+
+class CastMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _CASTMESSAGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.CastMessage)
+
+class AuthChallenge(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHCHALLENGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthChallenge)
+
+class AuthResponse(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHRESPONSE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthResponse)
+
+class AuthError(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHERROR
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthError)
+
+class DeviceAuthMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _DEVICEAUTHMESSAGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.DeviceAuthMessage)
 
 
 DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\003'))
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), 'H\003')
 # @@protoc_insertion_point(module_scope)
diff --git a/pychromecast/logging_pb2.py b/pychromecast/logging_pb2.py
deleted file mode 100644
index b0971da..0000000
--- a/pychromecast/logging_pb2.py
+++ /dev/null
@@ -1,809 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: logging.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='logging.proto',
-  package='extensions.core_api.cast_channel.proto',
-  syntax='proto2',
-  serialized_pb=_b('\n\rlogging.proto\x12&extensions.core_api.cast_channel.proto\"\xa0\x05\n\x0bSocketEvent\x12?\n\x04type\x18\x01 \x01(\x0e\x32\x31.extensions.core_api.cast_channel.proto.EventType\x12\x18\n\x10timestamp_micros\x18\x02 \x01(\x03\x12\x0f\n\x07\x64\x65tails\x18\x03 \x01(\t\x12\x18\n\x10net_return_value\x18\x04 \x01(\x05\x12\x19\n\x11message_namespace\x18\x05 \x01(\t\x12G\n\x0bready_state\x18\x06 \x01(\x0e\x32\x32.extensions.core_api.cast_channel.proto.ReadyState\x12Q\n\x10 [...]
-)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-_EVENTTYPE = _descriptor.EnumDescriptor(
-  name='EventType',
-  full_name='extensions.core_api.cast_channel.proto.EventType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='EVENT_TYPE_UNKNOWN', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CAST_SOCKET_CREATED', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_CHANGED', index=2, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONNECTION_STATE_CHANGED', index=3, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_CHANGED', index=4, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_CHANGED', index=5, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='ERROR_STATE_CHANGED', index=6, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONNECT_FAILED', index=7, number=7,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='TCP_SOCKET_CONNECT', index=8, number=8,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='TCP_SOCKET_SET_KEEP_ALIVE', index=9, number=9,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_CERT_WHITELISTED', index=10, number=10,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_SOCKET_CONNECT', index=11, number=11,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_INFO_OBTAINED', index=12, number=12,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='DER_ENCODED_CERT_OBTAIN', index=13, number=13,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='RECEIVED_CHALLENGE_REPLY', index=14, number=14,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='AUTH_CHALLENGE_REPLY', index=15, number=15,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONNECT_TIMED_OUT', index=16, number=16,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SEND_MESSAGE_FAILED', index=17, number=17,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MESSAGE_ENQUEUED', index=18, number=18,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SOCKET_WRITE', index=19, number=19,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MESSAGE_WRITTEN', index=20, number=20,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SOCKET_READ', index=21, number=21,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='MESSAGE_READ', index=22, number=22,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SOCKET_CLOSED', index=23, number=25,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_CERT_EXCESSIVE_LIFETIME', index=24, number=26,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_POLICY_ENFORCED', index=25, number=27,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='TCP_SOCKET_CONNECT_COMPLETE', index=26, number=28,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_SOCKET_CONNECT_COMPLETE', index=27, number=29,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_SOCKET_CONNECT_FAILED', index=28, number=30,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SEND_AUTH_CHALLENGE_FAILED', index=29, number=31,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='AUTH_CHALLENGE_REPLY_INVALID', index=30, number=32,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='PING_WRITE_ERROR', index=31, number=33,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=1175,
-  serialized_end=2007,
-)
-_sym_db.RegisterEnumDescriptor(_EVENTTYPE)
-
-EventType = enum_type_wrapper.EnumTypeWrapper(_EVENTTYPE)
-_CHANNELAUTH = _descriptor.EnumDescriptor(
-  name='ChannelAuth',
-  full_name='extensions.core_api.cast_channel.proto.ChannelAuth',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='SSL', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='SSL_VERIFIED', index=1, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2009,
-  serialized_end=2049,
-)
-_sym_db.RegisterEnumDescriptor(_CHANNELAUTH)
-
-ChannelAuth = enum_type_wrapper.EnumTypeWrapper(_CHANNELAUTH)
-_READYSTATE = _descriptor.EnumDescriptor(
-  name='ReadyState',
-  full_name='extensions.core_api.cast_channel.proto.ReadyState',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_NONE', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_CONNECTING', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_OPEN', index=2, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_CLOSING', index=3, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READY_STATE_CLOSED', index=4, number=5,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2052,
-  serialized_end=2185,
-)
-_sym_db.RegisterEnumDescriptor(_READYSTATE)
-
-ReadyState = enum_type_wrapper.EnumTypeWrapper(_READYSTATE)
-_CONNECTIONSTATE = _descriptor.EnumDescriptor(
-  name='ConnectionState',
-  full_name='extensions.core_api.cast_channel.proto.ConnectionState',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_NONE', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_TCP_CONNECT', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_TCP_CONNECT_COMPLETE', index=2, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_SSL_CONNECT', index=3, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_SSL_CONNECT_COMPLETE', index=4, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_AUTH_CHALLENGE_SEND', index=5, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE', index=6, number=7,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CONN_STATE_AUTH_CHALLENGE_REPLY_COMPLETE', index=7, number=8,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2188,
-  serialized_end=2483,
-)
-_sym_db.RegisterEnumDescriptor(_CONNECTIONSTATE)
-
-ConnectionState = enum_type_wrapper.EnumTypeWrapper(_CONNECTIONSTATE)
-_READSTATE = _descriptor.EnumDescriptor(
-  name='ReadState',
-  full_name='extensions.core_api.cast_channel.proto.ReadState',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_NONE', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_READ', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_READ_COMPLETE', index=2, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_DO_CALLBACK', index=3, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='READ_STATE_ERROR', index=4, number=5,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2486,
-  serialized_end=2619,
-)
-_sym_db.RegisterEnumDescriptor(_READSTATE)
-
-ReadState = enum_type_wrapper.EnumTypeWrapper(_READSTATE)
-_WRITESTATE = _descriptor.EnumDescriptor(
-  name='WriteState',
-  full_name='extensions.core_api.cast_channel.proto.WriteState',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_NONE', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_WRITE', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_WRITE_COMPLETE', index=2, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_DO_CALLBACK', index=3, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WRITE_STATE_ERROR', index=4, number=5,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2622,
-  serialized_end=2763,
-)
-_sym_db.RegisterEnumDescriptor(_WRITESTATE)
-
-WriteState = enum_type_wrapper.EnumTypeWrapper(_WRITESTATE)
-_ERRORSTATE = _descriptor.EnumDescriptor(
-  name='ErrorState',
-  full_name='extensions.core_api.cast_channel.proto.ErrorState',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_NONE', index=0, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_CHANNEL_NOT_OPEN', index=1, number=2,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_AUTHENTICATION_ERROR', index=2, number=3,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_CONNECT_ERROR', index=3, number=4,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_SOCKET_ERROR', index=4, number=5,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_TRANSPORT_ERROR', index=5, number=6,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_INVALID_MESSAGE', index=6, number=7,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_INVALID_CHANNEL_ID', index=7, number=8,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_CONNECT_TIMEOUT', index=8, number=9,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='CHANNEL_ERROR_UNKNOWN', index=9, number=10,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=2766,
... 415 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pychromecast.git



More information about the Python-modules-commits mailing list