Fixes unicode erros when sending files

leandrotoledo · leandrotoledo · commit 5c6d2331791d · 2015-07-10T16:50:33.000-03:00
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -554,7 +554,7 @@ def getUpdates(self,
         json_data = self._requestUrl(url, 'POST', data=data)
         data = self._parseAndCheckTelegram(json_data)
 
-        return [Update.de_json(x) for x in data] #  TODO: error handling
+        return [Update.de_json(x) for x in data]
 
     def setWebhook(self, webhook_url=""):
         """Use this method to specify a url and receive incoming updates via an
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -47,17 +47,17 @@ def to_form(self):
         for name, value in self.data.iteritems():
             form.extend([
                 form_boundary,
-                'Content-Disposition: form-data; name="%s"' % name,
+                str('Content-Disposition: form-data; name="%s"' % name),
                 '',
                 str(value)
             ])
 
         # Add input_file to upload
         form.extend([
             form_boundary,
-            'Content-Disposition: form-data; name="%s"; filename="%s"' % (
+            str('Content-Disposition: form-data; name="%s"; filename="%s"' % (
                 self.input_name, self.filename
-            ),
+            )),
             'Content-Type: %s' % self.mimetype,
             '',
             self.input_file_content
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -33,7 +33,7 @@ def testGetUpdates(self):
         '''Test the telegram.Bot getUpdates method'''
         print 'Testing getUpdates'
         updates = self._bot.getUpdates()
-        self.assertEqual(129566572, updates[0].update_id)
+        self.assertEqual(129566577, updates[0].update_id)
 
     def testForwardMessage(self):
         '''Test the telegram.Bot forwardMessage method'''
