Rename data -> raw_data

This commit is contained in:
Alex Root Junior 2017-05-26 03:51:21 +03:00
parent 44bf906110
commit 0d6af5bc8d
19 changed files with 227 additions and 240 deletions

View file

@ -4,9 +4,7 @@ from . import Deserializable
class Chat(Deserializable):
__slots__ = ('id', 'type', 'title', 'username', 'first_name', 'last_name', 'all_members_are_administrators')
def __init__(self, data, id, type, title, username, first_name, last_name, all_members_are_administrators):
self.data = data
def __init__(self, id, type, title, username, first_name, last_name, all_members_are_administrators):
self.id: int = id
self.type: str = type
self.title: str = title
@ -16,7 +14,7 @@ class Chat(Deserializable):
self.all_members_are_administrators: bool = all_members_are_administrators
@classmethod
def de_json(cls, data) -> 'Chat':
def de_json(cls, raw_data) -> 'Chat':
"""
id Integer Unique identifier for this chat. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
type String Type of chat, can be either private, group, supergroup or channel
@ -25,20 +23,20 @@ class Chat(Deserializable):
first_name String Optional. First name of the other party in a private chat
last_name String Optional. Last name of the other party in a private chat
all_members_are_administrators Boolean Optional. True if a group has All Members Are Admins enabled.
:param data:
:param raw_data:
:return:
"""
data = cls.check_json(data)
raw_data = cls.check_json(raw_data)
id: int = data.get('id')
type: str = data.get('type')
title: str = data.get('title')
username: str = data.get('username')
first_name: str = data.get('first_name')
last_name: str = data.get('last_name')
all_members_are_administrators: bool = data.get('all_members_are_administrators', False)
id: int = raw_data.get('id')
type: str = raw_data.get('type')
title: str = raw_data.get('title')
username: str = raw_data.get('username')
first_name: str = raw_data.get('first_name')
last_name: str = raw_data.get('last_name')
all_members_are_administrators: bool = raw_data.get('all_members_are_administrators', False)
return Chat(data, id, type, title, username, first_name, last_name, all_members_are_administrators)
return Chat(id, type, title, username, first_name, last_name, all_members_are_administrators)
@property
def full_name(self):