Merge pull request #66 from tchellomello/dev

Version 1.1.5

Author: tchellomello

.travis.yml

@@ -9,7 +9,7 @@ matrix:
       env: TOXENV=py35
     - python: "3.6"
       env: TOXENV=py36
-    - python: "2.7"
+    - python: "3.4.2"
       env: TOXENV=lint
 cache: pip
 install: pip install -U tox coveralls

cli/amcrest-cli

@@ -12,20 +12,22 @@
 #
 # vim:sw=4:ts=4:et
 
-try:
-    # import for Python 2.x
-    from ConfigParser import ConfigParser, NoOptionError, NoSectionError
-except:
-    # import for Python 3.x
-    from configparser import ConfigParser, NoOptionError, NoSectionError
+# pylint: disable=invalid-name
 
-import argcomplete
-import argparse
-import getpass
 import os
 import signal
 import sys
 import threading
+import getpass
+import argparse
+import argcomplete
+
+try:
+    # import for Python 2.x
+    from ConfigParser import ConfigParser, NoOptionError, NoSectionError
+except ImportError:
+    # import for Python 3.x
+    from configparser import ConfigParser, NoOptionError, NoSectionError
 
 from amcrest import AmcrestCamera
 
@@ -59,6 +61,7 @@ def main():
         formatter_class=argparse.RawTextHelpFormatter
     )
 
+    # pylint: disable=fixme
     # FIXME: Add metavar in the options for better understanding in the
     # --help output
 
@@ -595,7 +598,7 @@ def main():
                 camera.audio_stream_capture(httptype, channel)
 
         elif args.play_wav:
-            return(camera.play_wav(path_file=args.play_wav))
+            return camera.play_wav(path_file=args.play_wav)
 
         elif args.wlan_config:
             print((camera.wlan_config))

configure.ac

@@ -10,7 +10,7 @@
 # GNU General Public License for more details.
 define([VERSION_MAJOR], [1])
 define([VERSION_MINOR], [1])
-define([VERSION_FIX], [4])
+define([VERSION_FIX], [5])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_master])
 

python-amcrest.spec.in

@@ -165,6 +165,10 @@ make check-local
 %{_sysconfdir}/profile.d/amcrest-cli-autocomplete.sh
 
 %changelog
+* Tue Mar 28 2017  Marcelo Moreira de Mello <[email protected]> 1.1-5
+- Introduced unittests
+- Refactored Python imports
+
 * Tue Jan 31 2017 Marcelo Moreira de Mello <[email protected]> 1.1-4
 - Reverted patch 20f527eb which broke external 3rd party applications
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 setup(name='amcrest',
-      version='1.1.4',
+      version='1.1.5',
       description='Python wrapper implementation for Amcrest cameras.',
       author='Douglas Schilling Landgraf, Marcelo Moreira de Mello',
       author_email='[email protected], [email protected]',

src/amcrest/Makefile.am

@@ -20,7 +20,6 @@ pycrestdir = $(amcrestpythonlibdir)
 
 pycrest_PYTHON = \
 	__init__.py \
-	amcrest.py \
 	http.py \
 	config.py \
 	system.py \

src/amcrest/utils.py

@@ -35,7 +35,7 @@ def pretty(value, delimiter='='):
 
 def percent(part, whole):
     """Convert data to percent"""
-    result = 100 * float(part)/float(whole)
+    result = 100 * float(part) / float(whole)
     return float('{:.{prec}f}'.format(result, prec=PRECISION))
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, lint
+envlist = py27, py35, py36, lint
 skip_missing_interpreters = True
 
 [testenv]
@@ -20,4 +20,15 @@ deps =
 ignore_errors = True
 commands =
      flake8
+     flake8 src/amcrest
+     flake8 tui/amcrest-tui
+     flake8 cli/amcrest-cli
+
      pylint src/amcrest
+     pylint tui/amcrest-tui
+     pylint cli/amcrest-cli
+
+[flake8]
+ignore =
+    D102,
+    E121,

tui/amcrest-tui

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+"""Amcrest Text User Interface."""
 # -*- coding: utf-8 -*-
 #
 # This program is free software; you can redistribute it and/or modify
@@ -11,6 +12,8 @@
 # GNU General Public License for more details.
 #
 # vim:sw=4:ts=4:et
+# pylint: disable=invalid-name
+
 import os
 import signal
 import subprocess
@@ -20,14 +23,16 @@ import time
 try:
     # import for Python 2.x
     from ConfigParser import ConfigParser, NoOptionError, NoSectionError
-except:
+except ImportError:
     # import for Python 3.x
     from configparser import ConfigParser, NoOptionError, NoSectionError
+
 from argparse import ArgumentParser
 from amcrest import AmcrestCamera
 
 
 class AmcrestTuiViewer():
+    """Amcrest Text User Interface."""
 
     AMCREST_CONF = "{0}/.config/amcrest.conf".format(os.path.expanduser("~"))
 
@@ -39,8 +44,10 @@ class AmcrestTuiViewer():
                  merge_snapshots,
                  framebuffer_device):
         """
-        config_file_name - optional amcrest config file
-        timer_between_snapshots - timer between each snapshot
+        Define AmcrestTuiViever init method.
+
+        Config_file_name - optional amcrest config file
+        Timer_between_snapshots - timer between each snapshot
         """
         if not os.path.exists(self.AMCREST_CONF):
             raise RuntimeError(
@@ -57,6 +64,7 @@ class AmcrestTuiViewer():
         # Hold fbi pid
         self.cmd = None
 
+        # pylint: disable=fixme
         # FIXME: User might be able to provide config file path
         self.config_file_name = config_file_name
 
@@ -79,18 +87,18 @@ class AmcrestTuiViewer():
             try:
                 self.amcrest_config[camera_name] = {
                     'hostname': self.config.get(camera_name, 'hostname'),
-                    'port':     self.config.get(camera_name, 'port'),
+                    'port': self.config.get(camera_name, 'port'),
                     'username': self.config.get(camera_name, 'username'),
                     'password': self.config.get(camera_name, 'password'),
-                    'device':   AmcrestCamera(
+                    'device': AmcrestCamera(
                         host=self.config.get(camera_name, 'hostname'),
                         port=self.config.get(camera_name, 'port'),
                         user=self.config.get(camera_name, 'username'),
                         password=self.config.get(
                             camera_name, 'password')).camera
                 }
             except (NoSectionError, NoOptionError) as e:
-                print(("ERROR! %s found at %s" % (e, self.AMCREST_CONF)))
+                print("ERROR! %s found at %s" % (e, self.AMCREST_CONF))
                 raise
 
     def _kill_process(self, alarm, stack):
@@ -117,16 +125,19 @@ class AmcrestTuiViewer():
         except Exception as e:
             raise RuntimeError(e)
 
+    # pylint: disable=unused-variable
     def run(self):
+        """Call run method."""
         for counter, camera in enumerate(self.amcrest_config):
-            with tempfile.NamedTemporaryFile(
-                    dir='/tmp', delete=True) as tmpfile:
+            with tempfile.NamedTemporaryFile(dir='/tmp',
+                                             delete=True) as tmpfile:
 
+                # pylint: disable=attribute-defined-outside-init
                 # Add new tmpfile name
                 self.dev = self.amcrest_config[camera]['device']
 
                 os.system("clear")
-                print(("Loading new image from: {0}".format(camera)))
+                print("Loading new image from: {0}".format(camera))
                 try:
                     self._snapshot(tmpfile.name)
                 except RuntimeError as e:
@@ -195,6 +206,7 @@ if __name__ == "__main__":
     except Exception:
         raise
 
+    # pylint: disable=fixme
     # FIXME: Add option to save the snapshots in the disk
     # (requires to set dir as well)
     tui_viewer = AmcrestTuiViewer(