Fixes PEP8 and Lint minor issues

leandrotoledo · leandrotoledo · commit 6c13762c93e0 · 2015-11-10T12:10:50.000-02:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean pep8 lint test
+.PHONY: clean pep8 lint test install
 
 clean:
 	rm -fr build
@@ -16,6 +16,9 @@ lint:
 test:
 	nosetests
 
+install:
+	pip install -r requirements.txt
+
 help:
 	@echo "Available targets:"
 	@echo "- clean       Clean up the source directory"
diff --git a/telegram/parsemode.py b/telegram/parsemode.py
@@ -17,7 +17,8 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-"""This module contains a object that represents a Telegram Message Parse Modes"""
+"""This module contains a object that represents a Telegram
+Message Parse Modes"""
 
 
 class ParseMode(object):
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -23,13 +23,12 @@
 from ssl import SSLError
 
 try:
-    from urllib.parse import urlencode
     from urllib.request import urlopen, urlretrieve, Request
-    from urllib.error import HTTPError, URLError
+    from urllib.error import HTTPError
 except ImportError:
-    from urllib import urlencode, urlretrieve
+    from urllib import urlretrieve
     from urllib2 import urlopen, Request
-    from urllib2 import HTTPError, URLError
+    from urllib2 import HTTPError
 
 from telegram import (InputFile, TelegramError)
 
@@ -82,8 +81,8 @@ def post(url,
 
     # Add one second to the timeout of urlopen to allow data to be transferred
     # over the network.
-    if "timeout" in data:
-        timeout = data["timeout"] + 1.
+    if 'timeout' in data:
+        timeout = data['timeout'] + 1.
     else:
         timeout = None
 
