Merge branch 'develop'

This commit is contained in:
Dan 2018-12-31 17:27:54 +01:00
commit a13d825702
4 changed files with 14 additions and 10 deletions

View File

@ -82,7 +82,7 @@ If no error shows up you are good to go.
>>> import pyrogram
>>> pyrogram.__version__
'0.10.1'
'0.10.2'
.. _TgCrypto: https://docs.pyrogram.ml/resources/TgCrypto
.. _develop: http://github.com/pyrogram/pyrogram

View File

@ -23,7 +23,7 @@ __copyright__ = "Copyright (C) 2017-2018 Dan Tès <https://github.com/delivrance
"e" if sys.getfilesystemencoding() != "utf-8" else "\xe8"
)
__license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
__version__ = "0.10.1"
__version__ = "0.10.2"
from .api.errors import Error
from .client.types import (

View File

@ -17,6 +17,7 @@
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import re
from collections import OrderedDict
from pyrogram.api.types import (
MessageEntityBold as Bold,
@ -75,10 +76,11 @@ class HTML:
text = text.replace(match.group(), body)
offset += len(style) * 2 + 5 + (len(url) + 8 if url else 0)
return dict(
message=utils.remove_surrogates(text),
entities=entities
)
# TODO: OrderedDict to be removed in Python3.6
return OrderedDict([
("message", utils.remove_surrogates(text)),
("entities", entities)
])
def unparse(self, message: str, entities: list):
message = utils.add_surrogates(message).strip()

View File

@ -17,6 +17,7 @@
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import re
from collections import OrderedDict
from pyrogram.api.types import (
MessageEntityBold as Bold,
@ -97,10 +98,11 @@ class Markdown:
entities.append(entity)
message = message.replace(match.group(), body)
return dict(
message=utils.remove_surrogates(message),
entities=entities
)
# TODO: OrderedDict to be removed in Python3.6
return OrderedDict([
("message", utils.remove_surrogates(message)),
("entities", entities)
])
def unparse(self, message: str, entities: list):
message = utils.add_surrogates(message).strip()