Adding sendPhoto method

leandrotoledo · leandrotoledo · commit f7a15306a8ff · 2015-07-07T18:46:32.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+.env
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -81,6 +81,7 @@ def sendPhoto(self,
 
         data = {'chat_id': chat_id,
                 'photo': photo}
+
         if caption:
             data['caption'] = caption
         if reply_to_message_id:
@@ -143,13 +144,25 @@ def _requestUrl(self,
                     data=None):
 
         if method == 'POST':
-            try:
-                return requests.post(
-                    url,
-                    data=data
-                )
-            except requests.RequestException as e:
-                pass
+            if data.has_key('photo'):
+                try:
+                    photo = data.pop('photo')
+
+                    return requests.post(
+                        url,
+                        data=data,
+                        files={'photo': photo}
+                    )
+                except requests.RequestException as e:
+                    pass
+            else:
+                try:
+                    return requests.post(
+                        url,
+                        data=data
+                    )
+                except requests.RequestException as e:
+                    pass
         if method == 'GET':
             try:
                 return requests.get(url)
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+
+class InputFile(object):
+    pass
diff --git a/tests/telegram.png b/tests/telegram.png
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -44,7 +44,9 @@ def testForwardMessage(self):
         self.assertEqual(u'Oi', message.text)
         self.assertEqual(u'leandrotoledo', message.forward_from.username)
 
-    # def testSendPhoto(self):
-    #     '''Test the telegram.Bot sendPhoto method'''
-    #     print 'Testing sendPhoto'
-    #     message = self._bot.sendPhoto()
+    def testSendPhoto(self):
+        '''Test the telegram.Bot sendPhoto method'''
+        print 'Testing sendPhoto'
+        message = self._bot.sendPhoto(photo=open('tests/telegram.png', 'rb'),
+                                      chat_id=12173560)
+        #self.assertEqual(u'')

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +#!/usr/bin/env python
++
++
 +class InputFile(object):
 +    pass