Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into asyncio-dev

Browse Source 
# Conflicts:
#	pyrogram/__init__.py
This commit is contained in:
Dan 2020-05-02 21:02:40 +02:00
commit 2f3dc3f39e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyrogram/__init__.py
View File

@ -16,7 +16,7 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
__version__ = "0.17.0-async" __version__ = "0.17.1-async"
__license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)" __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
__copyright__ = "Copyright (C) 2017-2020 Dan <https://github.com/delivrance>" __copyright__ = "Copyright (C) 2017-2020 Dan <https://github.com/delivrance>"

6
pyrogram/client/types/object.py
View File

@ -16,7 +16,7 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import re import typing
from collections import OrderedDict from collections import OrderedDict
from datetime import datetime from datetime import datetime
from json import dumps from json import dumps
@ -48,7 +48,9 @@ class Object(metaclass=Meta):
if isinstance(obj, bytes): if isinstance(obj, bytes):
return repr(obj) return repr(obj)
if isinstance(obj, re.Match): # https://t.me/pyrogramchat/167281
# Instead of re.Match, which breaks for python <=3.6
if isinstance(obj, typing.Match):
return repr(obj) return repr(obj)
return OrderedDict( return OrderedDict(