python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-09 17:33:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

I think it will always be valid. (remove Deserializable.check_json)

Browse source
This commit is contained in:
Alex Root Junior 2017-07-29 03:24:50 +03:00
parent 5853973db8
commit 9e894cf06b
36 changed files with 0 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/types/animation.py
View file

@ -18,8 +18,6 @@ class Animation(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
thumb = PhotoSize.deserialize(raw_data.get('thumb'))
file_name = raw_data.get('file_name')

2
aiogram/types/audio.py
View file

@ -17,8 +17,6 @@ class Audio(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
duration = raw_data.get('duration')
performer = raw_data.get('performer')

16
aiogram/types/base.py
View file

@ -102,22 +102,6 @@ class Deserializable:
"""
raise NotImplementedError
@staticmethod
def check_json(raw_data) -> dict:
"""
Checks whether json_type is a dict or a string. If it is already a dict, it is returned as-is.
If it is not, it is converted to a dict by means of json.loads(json_type)
:param raw_data:
:return:
"""
if isinstance(raw_data, dict):
return raw_data
elif isinstance(raw_data, str):
return json.loads(raw_data)
else:
raise ValueError("data should be a json dict or string.")
def __str__(self):
return str(self.to_json())

2
aiogram/types/callback_query.py
View file

@ -28,8 +28,6 @@ class CallbackQuery(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
id = raw_data.get('id')
from_user = User.deserialize(raw_data.get('from'))
message = Message.deserialize(raw_data.get('message'))

2
aiogram/types/chat.py
View file

@ -25,8 +25,6 @@ class Chat(Deserializable):
@classmethod
def de_json(cls, raw_data) -> 'Chat':
raw_data = cls.check_json(raw_data)
id: int = raw_data.get('id')
type: str = raw_data.get('type')
title: str = raw_data.get('title')

2
aiogram/types/chat_member.py
View file

@ -41,8 +41,6 @@ class ChatMember(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
user = User.deserialize(raw_data.get('user'))
status = raw_data.get('status')

2
aiogram/types/chat_photo.py
View file

@ -14,8 +14,6 @@ class ChatPhoto(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
small_file_id = raw_data.get('small_file_id')
big_file_id = raw_data.get('big_file_id')

2
aiogram/types/chosen_inline_result.py
View file

@ -18,8 +18,6 @@ class ChosenInlineResult(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
result_id = raw_data.get('result_id')
from_user = User.deserialize(raw_data.get('from'))
location = Location.deserialize(raw_data.get('location'))

2
aiogram/types/contact.py
View file

@ -15,8 +15,6 @@ class Contact(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
phone_number = raw_data.get('phone_number')
first_name = raw_data.get('first_name')
last_name = raw_data.get('last_name')

2
aiogram/types/document.py
View file

@ -17,8 +17,6 @@ class Document(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
thumb = PhotoSize.deserialize(raw_data.get('thumb'))
file_name = raw_data.get('file_name')

2
aiogram/types/file.py
View file

@ -19,8 +19,6 @@ class File(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
file_size = raw_data.get('file_size')
file_path = raw_data.get('file_path')

2
aiogram/types/game.py
View file

@ -22,8 +22,6 @@ class Game(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
title = raw_data.get('title')
description = raw_data.get('description')
photo = PhotoSize.deserialize(raw_data.get('photo'))

2
aiogram/types/game_high_score.py
View file

@ -15,8 +15,6 @@ class GameHighScore(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
position = raw_data.get('position')
user = User.deserialize(raw_data.get('user'))
score = raw_data.get('score')

2
aiogram/types/inline_query.py
View file

@ -20,8 +20,6 @@ class InlineQuery(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
id = raw_data.get('id')
from_user = User.deserialize(raw_data.get('from'))
location = Location.deserialize(raw_data.get('location'))

2
aiogram/types/invoice.py
View file

@ -16,8 +16,6 @@ class Invoice(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
title = raw_data.get('title')
description = raw_data.get('description')
start_parameter = raw_data.get('start_parameter')

2
aiogram/types/location.py
View file

@ -13,8 +13,6 @@ class Location(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
longitude = raw_data.get('longitude')
latitude = raw_data.get('latitude')

2
aiogram/types/mask_position.py
View file

@ -16,8 +16,6 @@ class MaskPosition(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
point = raw_data.get('point')
x_shift = raw_data.get('x_shift')
y_shift = raw_data.get('y_shift')

2
aiogram/types/message.py
View file

@ -80,8 +80,6 @@ class Message(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
message_id = raw_data.get('message_id')
from_user = User.deserialize(raw_data.get('from'))
date = cls._parse_date(raw_data.get('date', 0))

2
aiogram/types/message_entity.py
View file

@ -20,8 +20,6 @@ class MessageEntity(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
type = raw_data.get('type')
offset = raw_data.get('offset')
length = raw_data.get('length')

2
aiogram/types/order_info.py
View file

@ -16,8 +16,6 @@ class OrderInfo(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
name = raw_data.get('name')
phone_number = raw_data.get('phone_number')
email = raw_data.get('email')

2
aiogram/types/photo_size.py
View file

@ -15,8 +15,6 @@ class PhotoSize(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
width = raw_data.get('width')
height = raw_data.get('height')

2
aiogram/types/pre_checkout_query.py
View file

@ -20,8 +20,6 @@ class PreCheckoutQuery(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
id = raw_data.get('id')
from_user = User.deserialize(raw_data.get('from'))
currency = raw_data.get('currency')

2
aiogram/types/response_parameters.py
View file

@ -13,8 +13,6 @@ class ResponseParameters(Deserializable):
@classmethod
def de_json(cls, raw_data):
data = cls.check_json(raw_data)
migrate_to_chat_id = data.get('migrate_to_chat_id')
retry_after = data.get('retry_after')

2
aiogram/types/shipping_address.py
View file

@ -17,8 +17,6 @@ class ShippingAddress(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
country_code = raw_data.get('country_code')
state = raw_data.get('state')
city = raw_data.get('city')

2
aiogram/types/shipping_query.py
View file

@ -17,8 +17,6 @@ class ShippingQuery(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
id = raw_data.get('id')
from_user = User.deserialize(raw_data.get('from'))
invoice_payload = raw_data.get('invoice_payload')

2
aiogram/types/sticker.py
View file

@ -22,8 +22,6 @@ class Sticker(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
width = raw_data.get('width')
height = raw_data.get('height')

2
aiogram/types/sticker_set.py
View file

@ -17,8 +17,6 @@ class StickerSet(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
name = raw_data.get('name')
title = raw_data.get('title')
is_mask = raw_data.get('is_mask')

2
aiogram/types/successful_payment.py
View file

@ -20,8 +20,6 @@ class SuccessfulPayment(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
currency = raw_data.get('currency')
total_amount = raw_data.get('total_amount')
invoice_payload = raw_data.get('invoice_payload')

2
aiogram/types/update.py
View file

@ -32,8 +32,6 @@ class Update(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
update_id = raw_data.get('update_id')
message = Message.deserialize(raw_data.get('message'))
edited_message = Message.deserialize(raw_data.get('edited_message'))

2
aiogram/types/user.py
View file

@ -21,8 +21,6 @@ class User(Deserializable):
@classmethod
def de_json(cls, raw_data: str or dict) -> 'User':
raw_data = cls.check_json(raw_data)
id = raw_data.get('id')
first_name = raw_data.get('first_name')
last_name = raw_data.get('last_name')

2
aiogram/types/user_profile_photos.py
View file

@ -14,8 +14,6 @@ class UserProfilePhotos(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
total_count = raw_data.get('total_count')
photos = [PhotoSize.deserialize(item) for item in raw_data.get('photos')]

2
aiogram/types/venue.py
View file

@ -16,8 +16,6 @@ class Venue(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
location = Location.deserialize(raw_data.get('location'))
title = raw_data.get('title')
address = raw_data.get('address')

2
aiogram/types/video.py
View file

@ -19,8 +19,6 @@ class Video(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
width = raw_data.get('width')
height = raw_data.get('height')

2
aiogram/types/video_note.py
View file

@ -17,8 +17,6 @@ class VideoNote(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
length = raw_data.get('length')
duration = raw_data.get('duration')

2
aiogram/types/voice.py
View file

@ -15,8 +15,6 @@ class Voice(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
file_id = raw_data.get('file_id')
duration = raw_data.get('duration')
mime_type = raw_data.get('mime_type')

2
aiogram/types/webhook_info.py
View file

@ -25,8 +25,6 @@ class WebhookInfo(Deserializable):
@classmethod
def de_json(cls, raw_data):
raw_data = cls.check_json(raw_data)
url = raw_data.get('url')
has_custom_certificate = raw_data.get('has_custom_certificate')
pending_update_count = raw_data.get('pending_update_count')