Merge branch 'develop' into asyncio

delivrance · delivrance · commit 9c7db1046eb0 · 2018-11-05T17:44:40.000+01:00
# Conflicts:
#	pyrogram/__init__.py
diff --git a/pyrogram/__init__.py b/pyrogram/__init__.py
@@ -31,7 +31,7 @@
     "e" if sys.getfilesystemencoding() != "utf-8" else "\xe8"
 )
 __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
-__version__ = "0.9.1.async1"
+__version__ = "0.9.2.async"
 
 from .api.errors import Error
 from .client.types import (
diff --git a/pyrogram/connection/connection.py b/pyrogram/connection/connection.py
@@ -36,7 +36,7 @@ class Connection:
         4: TCPIntermediateO
     }
 
-    def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, mode: int = 1):
+    def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, mode: int = 3):
         self.dc_id = dc_id
         self.ipv6 = ipv6
         self.proxy = proxy

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"e" if sys.getfilesystemencoding() != "utf-8" else "\xe8"`
`32`	`32`	`)`
`33`	`33`	`__license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"`
`34`		`-__version__ = "0.9.1.async1"`
	`34`	`+__version__ = "0.9.2.async"`
`35`	`35`
`36`	`36`	`from .api.errors import Error`
`37`	`37`	`from .client.types import (`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class Connection:`
`36`	`36`	`4: TCPIntermediateO`
`37`	`37`	`}`
`38`	`38`
`39`		`- def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, mode: int = 1):`
	`39`	`+ def __init__(self, dc_id: int, test_mode: bool, ipv6: bool, proxy: dict, mode: int = 3):`
`40`	`40`	`self.dc_id = dc_id`
`41`	`41`	`self.ipv6 = ipv6`
`42`	`42`	`self.proxy = proxy`