Adding more pre-commit hooks and testing InputFile python-telegram-bot#259

leandrotoledo · leandrotoledo · commit 703b8d130192 · 2016-05-14T22:24:35.000-03:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,4 +2,16 @@
     sha: 'v0.7.1'
     hooks:
     -   id: yapf
-        args: [-i, -r tests telegram]
+        args: ['-i', '-r']
+
+-   repo: git://github.com/pre-commit/pre-commit-hooks
+    sha: 'v0.5.0'
+    hooks:
+    -   id: flake8
+        args: ['telegram']
+
+-   repo: git://github.com/pre-commit/mirrors-pylint
+    sha: 'v1.5.5'
+    hooks:
+    -   id: pylint
+        args: ['--errors-only', '--disable=no-name-in-module,import-error']
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ test:
 	$(NOSETESTS) -v
 
 install:
-	$(PIP)  install -r requirements.txt
+	$(PIP)  install -r requirements.txt -r requirements-dev.txt
 
 help:
 	@echo "Available targets:"
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,3 +6,4 @@ unittest2
 flaky
 yapf
 pre-commit
+pre-commit-hooks
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -17,7 +17,6 @@
 #
 # 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 InputFile."""
 
 try:
@@ -44,8 +43,7 @@
 class InputFile(object):
     """This object represents a Telegram InputFile."""
 
-    def __init__(self,
-                 data):
+    def __init__(self, data):
         self.data = data
         self.boundary = choose_boundary()
 
@@ -87,25 +85,22 @@ def __init__(self,
                 # pylint: disable=E1101
                 self.filename = os.path.basename(self.input_file.name)
             elif from_url:
-                self.filename = os.path.basename(self.input_file.url) \
-                    .split('?')[0].split('&')[0]
+                self.filename = os.path.basename(self.input_file.url).split('?')[0].split('&')[0]
 
             try:
                 self.mimetype = InputFile.is_image(self.input_file_content)
                 if not self.filename or '.' not in self.filename:
                     self.filename = self.mimetype.replace('/', '.')
             except TelegramError:
-                self.mimetype = mimetypes.guess_type(self.filename)[0] or \
-                                DEFAULT_MIME_TYPE
+                self.mimetype = mimetypes.guess_type(self.filename)[0] or DEFAULT_MIME_TYPE
 
     @property
     def headers(self):
         """
         Returns:
             str:
         """
-        return {'User-agent': USER_AGENT,
-                'Content-type': self.content_type}
+        return {'User-agent': USER_AGENT, 'Content-type': self.content_type}
 
     @property
     def content_type(self):
@@ -126,21 +121,14 @@ def to_form(self):
         # Add data fields
         for name, value in self.data.items():
             form.extend([
-                form_boundary,
-                'Content-Disposition: form-data; name="%s"' % name,
-                '',
-                str(value)
+                form_boundary, '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"' % (
+            form_boundary, 'Content-Disposition: form-data; name="%s"; filename="%s"' % (
                 self.input_name, self.filename
-            ),
-            'Content-Type: %s' % self.mimetype,
-            '',
-            self.input_file_content
+            ), 'Content-Type: %s' % self.mimetype, '', self.input_file_content
         ])
 
         form.append('--' + self.boundary + '--')
@@ -193,14 +181,12 @@ def is_inputfile(data):
             bool
         """
         if data:
-            file_types = ['audio', 'document', 'photo', 'sticker', 'video',
-                          'voice', 'certificate']
+            file_types = ['audio', 'document', 'photo', 'sticker', 'video', 'voice', 'certificate']
             file_type = [i for i in list(data.keys()) if i in file_types]
 
             if file_type:
                 file_content = data[file_type[0]]
 
-                return hasattr(file_content, 'read') or str(
-                    file_content).startswith('http')
+                return hasattr(file_content, 'read') or str(file_content).startswith('http')
 
         return False
