don't send network_delay to telegram servers

jh0ker · jh0ker · commit 61dac76beee0 · 2015-11-10T22:40:19.000+01:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -650,7 +650,7 @@ def getUpdates(self,
                    offset=None,
                    limit=100,
                    timeout=0,
-                   network_delay=2):
+                   network_delay=2.):
         """Use this method to receive incoming updates using long polling.
 
         Args:
@@ -685,10 +685,8 @@ def getUpdates(self,
             data['limit'] = limit
         if timeout:
             data['timeout'] = timeout
-        if network_delay:
-            data['network_delay'] = network_delay
 
-        result = request.post(url, data)
+        result = request.post(url, data, network_delay=network_delay)
 
         if result:
             self.logger.info(
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -67,13 +67,17 @@ def get(url):
 
 
 def post(url,
-         data):
+         data,
+         network_delay=2.):
     """Request an URL.
     Args:
       url:
         The web location we want to retrieve.
       data:
         A dict of (str, unicode) key/value pairs.
+      network_delay:
+        Additional timeout in seconds to allow the response from Telegram to
+        take some time.
 
     Returns:
       A JSON object.
@@ -82,10 +86,10 @@ def post(url,
     # Add time to the timeout of urlopen to allow data to be transferred over
     # the network.
     if 'timeout' in data:
-        if 'network_delay' in data:
-            timeout = data['timeout'] + data['network_delay']
+        if network_delay:
+            timeout = data['timeout'] + network_delay
         else:
-            timeout = data['timeout'] + 2.
+            timeout = data['timeout']
     else:
         timeout = None
 
