Skip to content

Commit 69d705a

Browse files
leandrotoledoleandrotoledo
committed
strize raw String properties for Telegram Objects
1 parent cdcf248 commit 69d705a

8 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎telegram/audio.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ def __init__(self,
4949
duration,
5050
**kwargs):
5151
# Required
52-
self.file_id = file_id
52+
self.file_id = str(file_id)
5353
self.duration = int(duration)
5454
# Optionals
55-
self.performer = kwargs.get('performer', '')
56-
self.title = kwargs.get('title', '')
57-
self.mime_type = kwargs.get('mime_type', '')
55+
self.performer = str(kwargs.get('performer', ''))
56+
self.title = str(kwargs.get('title', ''))
57+
self.mime_type = str(kwargs.get('mime_type', ''))
5858
self.file_size = int(kwargs.get('file_size', 0))
5959

6060
@staticmethod

‎telegram/contact.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self,
4545
first_name,
4646
**kwargs):
4747
# Required
48-
self.phone_number = phone_number
48+
self.phone_number = str(phone_number)
4949
self.first_name = first_name
5050
# Optionals
5151
self.last_name = kwargs.get('last_name', '')

‎telegram/document.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ def __init__(self,
4646
file_id,
4747
**kwargs):
4848
# Required
49-
self.file_id = file_id
49+
self.file_id = str(file_id)
5050
# Optionals
5151
self.thumb = kwargs.get('thumb')
52-
self.file_name = kwargs.get('file_name', '')
53-
self.mime_type = kwargs.get('mime_type', '')
52+
self.file_name = str(kwargs.get('file_name', ''))
53+
self.mime_type = str(kwargs.get('mime_type', ''))
5454
self.file_size = int(kwargs.get('file_size', 0))
5555

5656
@staticmethod

‎telegram/error.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@
2222
class TelegramError(Exception):
2323
"""This object represents a Telegram Error."""
2424

25-
@property
26-
def message(self):
25+
def __init__(self, message):
2726
"""
2827
Returns:
2928
str:
3029
"""
31-
return self.args[0]
30+
super(TelegramError, self).__init__()
31+
32+
self.message = message.split(':')[-1].strip().capitalize()
33+
34+
def __str__(self):
35+
return '%s' % (self.message)

‎telegram/sticker.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(self,
4848
height,
4949
**kwargs):
5050
# Required
51-
self.file_id = file_id
51+
self.file_id = str(file_id)
5252
self.width = int(width)
5353
self.height = int(height)
5454
# Optionals

‎telegram/update.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def __init__(self,
3939
update_id,
4040
**kwargs):
4141
# Required
42-
self.update_id = update_id
42+
self.update_id = int(update_id)
4343
# Optionals
4444
self.message = kwargs.get('message')
4545

‎telegram/video.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ def __init__(self,
5353
duration,
5454
**kwargs):
5555
# Required
56-
self.file_id = file_id
56+
self.file_id = str(file_id)
5757
self.width = int(width)
5858
self.height = int(height)
5959
self.duration = int(duration)
6060
# Optionals
6161
self.thumb = kwargs.get('thumb')
62-
self.mime_type = kwargs.get('mime_type', '')
62+
self.mime_type = str(kwargs.get('mime_type', ''))
6363
self.file_size = int(kwargs.get('file_size', 0))
6464

6565
@staticmethod

‎telegram/voice.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ def __init__(self,
4444
file_id,
4545
**kwargs):
4646
# Required
47-
self.file_id = file_id
47+
self.file_id = str(file_id)
4848
# Optionals
4949
self.duration = int(kwargs.get('duration', 0))
50-
self.mime_type = kwargs.get('mime_type', '')
50+
self.mime_type = str(kwargs.get('mime_type', ''))
5151
self.file_size = int(kwargs.get('file_size', 0))
5252

5353
@staticmethod

0 commit comments

Comments
 (0)