diff --git a/.pylintrc b/.pylintrc index e569a9e..bea8d97 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,5 +1,5 @@ # pylintrc -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details [MASTER] diff --git a/.travis.yml b/.travis.yml index 46cdc57..02ef2c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # .travis.yml -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details os: diff --git a/AUTHORS.rst b/AUTHORS.rst index b802daf..7bf7d3b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,5 +1,5 @@ .. AUTHORS.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details Authors diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e470103..49102b5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,10 +1,11 @@ .. CHANGELOG.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details Changelog ========= +* 0.9.5 [2016-01-08]: Bug fixes * 0.9.4 [2015-12-18]: Minor documentation update regarding continuous integration setup * 0.9.3 [2015-12-17]: Fixed critical bug in plot module that prevented figures diff --git a/LICENSE b/LICENSE index dbb142a..1d451c5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013-2015 Pablo Acosta-Serafini +Copyright (c) 2013-2016 Pablo Acosta-Serafini Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/MANIFEST.in b/MANIFEST.in index 41ec290..2f0f036 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ # MANIFEST.in -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details include AUTHORS.rst include CHANGELOG.rst diff --git a/Makefile b/Makefile index 3f8091a..83c58d8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details PKG_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) diff --git a/README.rst b/README.rst index 6ab127b..6ab410d 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ .. README.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details @@ -419,7 +419,7 @@ License The MIT License (MIT) -Copyright (c) 2013-2015 Pablo Acosta-Serafini +Copyright (c) 2013-2016 Pablo Acosta-Serafini Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/TODO.rst b/TODO.rst index 0370b04..6b1d703 100644 --- a/TODO.rst +++ b/TODO.rst @@ -1,5 +1,5 @@ .. TODO.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details To-do List diff --git a/appveyor.yml b/appveyor.yml index 14a0e5a..6ebafe2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # appveyor.yml -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details environment: diff --git a/docs/README.rst b/docs/README.rst index f4af2dc..c8c10d0 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -1,5 +1,5 @@ .. README.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details diff --git a/docs/conf.py b/docs/conf.py index 3aeb4a8..cfe9c96 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -56,16 +56,16 @@ # General information about the project. project = u'Putil' -copyright = u'2013-2015, Pablo Acosta-Serafini' +copyright = u'2013-2016, Pablo Acosta-Serafini' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.9.4' +version = '0.9.5' # The full version, including alpha/beta/rc tags. -release = '0.9.4' +release = '0.9.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -283,7 +283,7 @@ epub_title = u'Putil library' epub_author = u'Pablo Acosta-Serafini' epub_publisher = u'Pablo Acosta-Serafini' -epub_copyright = u'2013-2015, Pablo Acosta-Serafini' +epub_copyright = u'2013-2016, Pablo Acosta-Serafini' # The basename for the epub file. It defaults to the project name. #epub_basename = u'src' diff --git a/docs/eng.rst b/docs/eng.rst index bd907f5..b161ba7 100644 --- a/docs/eng.rst +++ b/docs/eng.rst @@ -1,5 +1,5 @@ .. eng.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.eng diff --git a/docs/exdoc.rst b/docs/exdoc.rst index b53adf7..1be71d4 100644 --- a/docs/exdoc.rst +++ b/docs/exdoc.rst @@ -1,5 +1,5 @@ .. exdoc.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.exdoc diff --git a/docs/exh.rst b/docs/exh.rst index e1015f1..6bfa986 100644 --- a/docs/exh.rst +++ b/docs/exh.rst @@ -1,5 +1,5 @@ .. exh.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.exh diff --git a/docs/index.rst b/docs/index.rst index d4f1e0c..65fea94 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ .. index.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. _index: diff --git a/docs/misc.rst b/docs/misc.rst index 69704cf..8b7f2aa 100644 --- a/docs/misc.rst +++ b/docs/misc.rst @@ -1,5 +1,5 @@ .. misc.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.misc diff --git a/docs/pcontracts.rst b/docs/pcontracts.rst index 298de22..13b9ef7 100644 --- a/docs/pcontracts.rst +++ b/docs/pcontracts.rst @@ -1,5 +1,5 @@ .. pcontracts.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.pcontracts diff --git a/docs/pcsv.rst b/docs/pcsv.rst index 1635f44..f9ecc6e 100644 --- a/docs/pcsv.rst +++ b/docs/pcsv.rst @@ -1,5 +1,5 @@ .. pcsv.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.pcsv diff --git a/docs/pinspect.rst b/docs/pinspect.rst index b7d9cc1..62f0cee 100644 --- a/docs/pinspect.rst +++ b/docs/pinspect.rst @@ -1,5 +1,5 @@ .. pinspect.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.pinspect diff --git a/docs/plot.rst b/docs/plot.rst index e87a7ad..7a745e5 100644 --- a/docs/plot.rst +++ b/docs/plot.rst @@ -1,5 +1,5 @@ .. plot.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.plot diff --git a/docs/ptypes.rst b/docs/ptypes.rst index 3b9866c..6621bcd 100644 --- a/docs/ptypes.rst +++ b/docs/ptypes.rst @@ -1,5 +1,5 @@ .. ptypes.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.ptypes diff --git a/docs/support/__init__.py b/docs/support/__init__.py index 03aac80..cda1dce 100644 --- a/docs/support/__init__.py +++ b/docs/support/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/docs/support/build-docs.sh b/docs/support/build-docs.sh index 3ec5c9b..d57ca00 100755 --- a/docs/support/build-docs.sh +++ b/docs/support/build-docs.sh @@ -1,6 +1,6 @@ #!/bin/bash # build-docs.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details set -e diff --git a/docs/support/compare_images.py b/docs/support/compare_images.py index 881ed60..bb045a4 100755 --- a/docs/support/compare_images.py +++ b/docs/support/compare_images.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # compare_images.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/docs/support/exh_example.py b/docs/support/exh_example.py index bf58389..d493779 100644 --- a/docs/support/exh_example.py +++ b/docs/support/exh_example.py @@ -1,5 +1,5 @@ # exh_example.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,W0212,W0640 diff --git a/docs/support/incfile.py b/docs/support/incfile.py index 1363eb4..2bf6cca 100644 --- a/docs/support/incfile.py +++ b/docs/support/incfile.py @@ -1,5 +1,5 @@ # incfile.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0914 diff --git a/docs/support/misc_example_1.py b/docs/support/misc_example_1.py index e7faf67..a06bf51 100644 --- a/docs/support/misc_example_1.py +++ b/docs/support/misc_example_1.py @@ -1,5 +1,5 @@ # misc_example_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,E1129,W0702 diff --git a/docs/support/misc_example_2.py b/docs/support/misc_example_2.py index fe020f6..f212796 100644 --- a/docs/support/misc_example_2.py +++ b/docs/support/misc_example_2.py @@ -1,5 +1,5 @@ # misc_example_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0702 diff --git a/docs/support/misc_example_3.py b/docs/support/misc_example_3.py index 896a0cb..4ab1294 100644 --- a/docs/support/misc_example_3.py +++ b/docs/support/misc_example_3.py @@ -1,5 +1,5 @@ # misc_example_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0702 diff --git a/docs/support/my_module.py b/docs/support/my_module.py index 665bb96..8c857bb 100644 --- a/docs/support/my_module.py +++ b/docs/support/my_module.py @@ -1,5 +1,5 @@ # my_module.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0105 diff --git a/docs/support/my_module_ref.py b/docs/support/my_module_ref.py index edce803..a775dde 100644 --- a/docs/support/my_module_ref.py +++ b/docs/support/my_module_ref.py @@ -1,5 +1,5 @@ # my_module_ref.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0105 diff --git a/docs/support/pcontracts_example_1.py b/docs/support/pcontracts_example_1.py index 99a83c9..71c4780 100644 --- a/docs/support/pcontracts_example_1.py +++ b/docs/support/pcontracts_example_1.py @@ -1,5 +1,5 @@ # pcontracts_example_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0702 diff --git a/docs/support/pcontracts_example_2.py b/docs/support/pcontracts_example_2.py index 87419b6..4a05b79 100644 --- a/docs/support/pcontracts_example_2.py +++ b/docs/support/pcontracts_example_2.py @@ -1,5 +1,5 @@ # pcontracts_example_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0702 diff --git a/docs/support/pcontracts_example_3.py b/docs/support/pcontracts_example_3.py index 36e1a14..28e2731 100644 --- a/docs/support/pcontracts_example_3.py +++ b/docs/support/pcontracts_example_3.py @@ -1,5 +1,5 @@ # pcontracts_example_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0613,W0702 diff --git a/docs/support/pcsv_example_1.py b/docs/support/pcsv_example_1.py index 5964abf..85dbde9 100644 --- a/docs/support/pcsv_example_1.py +++ b/docs/support/pcsv_example_1.py @@ -1,5 +1,5 @@ # pcsv_example_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pcsv_example_2.py b/docs/support/pcsv_example_2.py index ee73201..80e6f22 100644 --- a/docs/support/pcsv_example_2.py +++ b/docs/support/pcsv_example_2.py @@ -1,5 +1,5 @@ # pcsv_example_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pcsv_example_3.py b/docs/support/pcsv_example_3.py index 7310b11..f814c1c 100644 --- a/docs/support/pcsv_example_3.py +++ b/docs/support/pcsv_example_3.py @@ -1,5 +1,5 @@ # pcsv_example_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pcsv_example_4.py b/docs/support/pcsv_example_4.py index d1cc0d3..3932048 100644 --- a/docs/support/pcsv_example_4.py +++ b/docs/support/pcsv_example_4.py @@ -1,5 +1,5 @@ # pcsv_example_4.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pcsv_example_5.py b/docs/support/pcsv_example_5.py index 6a3c64e..d90f4a3 100644 --- a/docs/support/pcsv_example_5.py +++ b/docs/support/pcsv_example_5.py @@ -1,5 +1,5 @@ # pcsv_example_5.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pcsv_example_6.py b/docs/support/pcsv_example_6.py index 6664cba..c3e0694 100644 --- a/docs/support/pcsv_example_6.py +++ b/docs/support/pcsv_example_6.py @@ -1,5 +1,5 @@ # pcsv_example_6.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104 diff --git a/docs/support/pinspect_example_1.py b/docs/support/pinspect_example_1.py index e454f3a..5b501b3 100644 --- a/docs/support/pinspect_example_1.py +++ b/docs/support/pinspect_example_1.py @@ -1,5 +1,5 @@ # pinspect_example_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0212,W0611,W0612 diff --git a/docs/support/plot_example_1.py b/docs/support/plot_example_1.py index 7170277..9de09b2 100644 --- a/docs/support/plot_example_1.py +++ b/docs/support/plot_example_1.py @@ -1,5 +1,5 @@ # plot_example_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0413,W0613 diff --git a/docs/support/plot_example_2.py b/docs/support/plot_example_2.py index 903089f..be37a48 100644 --- a/docs/support/plot_example_2.py +++ b/docs/support/plot_example_2.py @@ -1,5 +1,5 @@ # plot_example_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903 diff --git a/docs/support/plot_example_3.py b/docs/support/plot_example_3.py index c88509e..e19bd0a 100644 --- a/docs/support/plot_example_3.py +++ b/docs/support/plot_example_3.py @@ -1,5 +1,5 @@ # plot_example_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,R0903 diff --git a/docs/support/plot_example_4.py b/docs/support/plot_example_4.py index 5566ef8..7146e7f 100644 --- a/docs/support/plot_example_4.py +++ b/docs/support/plot_example_4.py @@ -1,5 +1,5 @@ # plot_example_4.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410 diff --git a/docs/support/plot_example_5.py b/docs/support/plot_example_5.py index b12b7cd..0e3eca5 100644 --- a/docs/support/plot_example_5.py +++ b/docs/support/plot_example_5.py @@ -1,5 +1,5 @@ # plot_example_5.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,E0611,F0401,R0903 diff --git a/docs/support/plot_example_6.py b/docs/support/plot_example_6.py index 94c911e..44e2eb3 100644 --- a/docs/support/plot_example_6.py +++ b/docs/support/plot_example_6.py @@ -1,5 +1,5 @@ # plot_example_6.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410 diff --git a/docs/support/plot_example_7.py b/docs/support/plot_example_7.py index a8373ae..0351892 100644 --- a/docs/support/plot_example_7.py +++ b/docs/support/plot_example_7.py @@ -1,5 +1,5 @@ # plot_example_7.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410 diff --git a/docs/support/python2_module.py b/docs/support/python2_module.py index 9470d12..5a0f9c7 100644 --- a/docs/support/python2_module.py +++ b/docs/support/python2_module.py @@ -1,5 +1,5 @@ # python2_module.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/python3_module.py b/docs/support/python3_module.py index f78acfa..72bbd9c 100644 --- a/docs/support/python3_module.py +++ b/docs/support/python3_module.py @@ -1,5 +1,5 @@ # python3_module.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/requirements_to_rst.py b/docs/support/requirements_to_rst.py index 665fc8e..400e831 100755 --- a/docs/support/requirements_to_rst.py +++ b/docs/support/requirements_to_rst.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # requirements_to_rst.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0912,R0914,R0915 diff --git a/docs/support/term_echo.py b/docs/support/term_echo.py index 821e877..bab1602 100644 --- a/docs/support/term_echo.py +++ b/docs/support/term_echo.py @@ -1,5 +1,5 @@ # term_echo.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/docs/support/test_my_module.py b/docs/support/test_my_module.py index 535369b..8ab032e 100644 --- a/docs/support/test_my_module.py +++ b/docs/support/test_my_module.py @@ -1,5 +1,5 @@ # test_my_module.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,R0903,W0104,W0105 diff --git a/docs/support/trace_ex_eng.py b/docs/support/trace_ex_eng.py index 238bad6..ccd451f 100644 --- a/docs/support/trace_ex_eng.py +++ b/docs/support/trace_ex_eng.py @@ -1,5 +1,5 @@ # trace_ex_eng.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_concatenate.py b/docs/support/trace_ex_pcsv_concatenate.py index f9c3ac1..97c2f62 100644 --- a/docs/support/trace_ex_pcsv_concatenate.py +++ b/docs/support/trace_ex_pcsv_concatenate.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_concatenate.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_csv_file.py b/docs/support/trace_ex_pcsv_csv_file.py index 7ce53b5..a4454c4 100644 --- a/docs/support/trace_ex_pcsv_csv_file.py +++ b/docs/support/trace_ex_pcsv_csv_file.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_csv_file.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_dsort.py b/docs/support/trace_ex_pcsv_dsort.py index ad61257..5ff7c11 100644 --- a/docs/support/trace_ex_pcsv_dsort.py +++ b/docs/support/trace_ex_pcsv_dsort.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_dsort.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_merge.py b/docs/support/trace_ex_pcsv_merge.py index 0c84c3f..aed9369 100644 --- a/docs/support/trace_ex_pcsv_merge.py +++ b/docs/support/trace_ex_pcsv_merge.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_merge.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_replace.py b/docs/support/trace_ex_pcsv_replace.py index aac3cb5..1184e86 100644 --- a/docs/support/trace_ex_pcsv_replace.py +++ b/docs/support/trace_ex_pcsv_replace.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_replace.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_pcsv_write.py b/docs/support/trace_ex_pcsv_write.py index ae4c648..323bbf2 100644 --- a/docs/support/trace_ex_pcsv_write.py +++ b/docs/support/trace_ex_pcsv_write.py @@ -1,5 +1,5 @@ # trace_ex_pcsv_write.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_basic_source.py b/docs/support/trace_ex_plot_basic_source.py index fd6e602..3c0db48 100644 --- a/docs/support/trace_ex_plot_basic_source.py +++ b/docs/support/trace_ex_plot_basic_source.py @@ -1,5 +1,5 @@ # trace_ex_plot_basic_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_csv_source.py b/docs/support/trace_ex_plot_csv_source.py index 85a6fc8..609dfe9 100644 --- a/docs/support/trace_ex_plot_csv_source.py +++ b/docs/support/trace_ex_plot_csv_source.py @@ -1,5 +1,5 @@ # trace_ex_plot_csv_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_figure.py b/docs/support/trace_ex_plot_figure.py index 8c1d336..404f6b1 100644 --- a/docs/support/trace_ex_plot_figure.py +++ b/docs/support/trace_ex_plot_figure.py @@ -1,5 +1,5 @@ # trace_ex_plot_figure.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_functions.py b/docs/support/trace_ex_plot_functions.py index 5f8afed..e33b9ff 100644 --- a/docs/support/trace_ex_plot_functions.py +++ b/docs/support/trace_ex_plot_functions.py @@ -1,5 +1,5 @@ # trace_ex_plot_functions.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_panel.py b/docs/support/trace_ex_plot_panel.py index 50c00ee..83c80fc 100644 --- a/docs/support/trace_ex_plot_panel.py +++ b/docs/support/trace_ex_plot_panel.py @@ -1,5 +1,5 @@ # trace_ex_plot_panel.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_plot_series.py b/docs/support/trace_ex_plot_series.py index 18a1a90..f424ce2 100644 --- a/docs/support/trace_ex_plot_series.py +++ b/docs/support/trace_ex_plot_series.py @@ -1,5 +1,5 @@ # trace_ex_plot_series.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_ex_tree.py b/docs/support/trace_ex_tree.py index 4196db2..3004296 100644 --- a/docs/support/trace_ex_tree.py +++ b/docs/support/trace_ex_tree.py @@ -1,5 +1,5 @@ # trace_ex_tree.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/trace_my_module_1.py b/docs/support/trace_my_module_1.py index d8daf83..2bdf2c2 100644 --- a/docs/support/trace_my_module_1.py +++ b/docs/support/trace_my_module_1.py @@ -1,5 +1,5 @@ # trace_my_module_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410 diff --git a/docs/support/trace_my_module_2.py b/docs/support/trace_my_module_2.py index 6370030..1619ecb 100644 --- a/docs/support/trace_my_module_2.py +++ b/docs/support/trace_my_module_2.py @@ -1,5 +1,5 @@ # trace_my_module_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0410,W0104,W0403 diff --git a/docs/support/trace_support.py b/docs/support/trace_support.py index c672678..3fd269e 100644 --- a/docs/support/trace_support.py +++ b/docs/support/trace_support.py @@ -1,5 +1,5 @@ # trace_support.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/docs/support/tree_example.py b/docs/support/tree_example.py index cc48853..c5b89f7 100644 --- a/docs/support/tree_example.py +++ b/docs/support/tree_example.py @@ -1,5 +1,5 @@ # tree_example.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/docs/test.rst b/docs/test.rst index 6411122..4b8db8b 100644 --- a/docs/test.rst +++ b/docs/test.rst @@ -1,5 +1,5 @@ .. test.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.test diff --git a/docs/tree.rst b/docs/tree.rst index 01b8970..0f8af3a 100644 --- a/docs/tree.rst +++ b/docs/tree.rst @@ -1,5 +1,5 @@ .. tree.rst -.. Copyright (c) 2013-2015 Pablo Acosta-Serafini +.. Copyright (c) 2013-2016 Pablo Acosta-Serafini .. See LICENSE for details .. py:module:: putil.tree diff --git a/putil/__init__.py b/putil/__init__.py index e22ca48..b253377 100644 --- a/putil/__init__.py +++ b/putil/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/putil/compat2.py b/putil/compat2.py index 823cf99..8375184 100644 --- a/putil/compat2.py +++ b/putil/compat2.py @@ -1,5 +1,5 @@ # compat2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0122,W0613 diff --git a/putil/compat3.py b/putil/compat3.py index c3ce2f5..2d7a91e 100644 --- a/putil/compat3.py +++ b/putil/compat3.py @@ -1,5 +1,5 @@ # compat3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0122,W0613 diff --git a/putil/eng.py b/putil/eng.py index f148649..69362ee 100644 --- a/putil/eng.py +++ b/putil/eng.py @@ -1,5 +1,5 @@ # eng.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/exdoc.py b/putil/exdoc.py index ce30865..f8965af 100644 --- a/putil/exdoc.py +++ b/putil/exdoc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # exdoc.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0411,E0012,E0611,E1101,E1103,F0401,R0201,R0903,R0913 # pylint: disable=W0105,W0122,W0212,W0611,W0613 diff --git a/putil/exh.py b/putil/exh.py index ed9c2e3..b5f5299 100644 --- a/putil/exh.py +++ b/putil/exh.py @@ -1,5 +1,5 @@ # exh.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0411,E0012,E0611,E1101,E1103,F0401 # pylint: disable=R0201,R0912,R0914,R0915,W0122,W0212,W0613,W0631 @@ -609,7 +609,7 @@ def _get_callable_path(self): # Decorator flag vector idv = [item[3] for item in stack] # Fully qualified callable path construction - ret = ( + ret = list( self._get_callable_full_name(fob, fin, uobj) for fob, fin, uobj, _ in stack ) @@ -620,8 +620,7 @@ def _get_callable_path(self): if in_decorator and (name == prev_name): del ret[num-num_del_items] num_del_items += 1 - ret = self._callables_separator.join(ret) - return callable_id, ret + return callable_id, self._callables_separator.join(ret) else: # pragma: no cover # Method works with decorator 4.x series def _get_callable_path(self): diff --git a/putil/misc.py b/putil/misc.py index bc2117c..c57aecc 100644 --- a/putil/misc.py +++ b/putil/misc.py @@ -1,5 +1,5 @@ # misc.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0611 diff --git a/putil/pcontracts.py b/putil/pcontracts.py index 59e8820..3febc58 100644 --- a/putil/pcontracts.py +++ b/putil/pcontracts.py @@ -1,5 +1,5 @@ # pcontracts.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E0102,E0611,E1101,F0401,R0912,R0914,W0212,W0613 @@ -447,9 +447,14 @@ def wrapper(func, *args, **kwargs): ) } ] + func_module = ( + getattr(func, '__module__') + if hasattr(func, '__module__') else + 'unknown' + ) for exdict in contracts_dicts: - exname = 'contract_{0}_{1}_{2}'.format( - func.__name__, + exname = 'contract:{0}.{1}_{2}'.format( + '{0}.{1}'.format(func_module, func.__name__), param_name, exdict['num'] ) @@ -487,8 +492,13 @@ def wrapper(func, *args, **kwargs): param_name = re.search(r"'\w+'", eobj.error).group()[1:-1] # Raise exception exdict = _get_contract_exception_dict(eobj.error) - exname = 'contract_{0}_{1}_{2}'.format( - func.__name__, + func_module = ( + getattr(func, '__module__') + if hasattr(func, '__module__') else + 'unknown' + ) + exname = 'contract:{0}.{1}_{2}'.format( + '{0}.{1}'.format(func_module, func.__name__), param_name, exdict['num'] ) diff --git a/putil/pcsv/__init__.py b/putil/pcsv/__init__.py index 67deafb..e6cc9bc 100644 --- a/putil/pcsv/__init__.py +++ b/putil/pcsv/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302 diff --git a/putil/pcsv/concatenate.py b/putil/pcsv/concatenate.py index b966992..975b83f 100644 --- a/putil/pcsv/concatenate.py +++ b/putil/pcsv/concatenate.py @@ -1,5 +1,5 @@ # concatenate.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pcsv/csv_file.py b/putil/pcsv/csv_file.py index 03bdefa..70e8781 100644 --- a/putil/pcsv/csv_file.py +++ b/putil/pcsv/csv_file.py @@ -1,5 +1,5 @@ # csv_file.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pcsv/dsort.py b/putil/pcsv/dsort.py index e2f51c4..8feff24 100644 --- a/putil/pcsv/dsort.py +++ b/putil/pcsv/dsort.py @@ -1,5 +1,5 @@ # dsort.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pcsv/merge.py b/putil/pcsv/merge.py index da613f9..273da3e 100644 --- a/putil/pcsv/merge.py +++ b/putil/pcsv/merge.py @@ -1,5 +1,5 @@ # merge.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pcsv/replace.py b/putil/pcsv/replace.py index 937157f..1ae380e 100644 --- a/putil/pcsv/replace.py +++ b/putil/pcsv/replace.py @@ -1,5 +1,5 @@ # replace.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pcsv/write.py b/putil/pcsv/write.py index 6df2de6..62453ad 100644 --- a/putil/pcsv/write.py +++ b/putil/pcsv/write.py @@ -1,5 +1,5 @@ # write.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0611 diff --git a/putil/pinspect.py b/putil/pinspect.py index 5c54847..046382b 100644 --- a/putil/pinspect.py +++ b/putil/pinspect.py @@ -1,5 +1,5 @@ # pinspect.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E0012,E0611,F0401,R0912,R0916,W0212,W0631,W1504 diff --git a/putil/plot/__init__.py b/putil/plot/__init__.py index 09b9204..f4a22fe 100644 --- a/putil/plot/__init__.py +++ b/putil/plot/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302 diff --git a/putil/plot/basic_source.py b/putil/plot/basic_source.py index 48c0b59..cda3853 100644 --- a/putil/plot/basic_source.py +++ b/putil/plot/basic_source.py @@ -1,5 +1,5 @@ # basic_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,W0105,W0212 diff --git a/putil/plot/constants.py b/putil/plot/constants.py index c1bb983..f6b4542 100644 --- a/putil/plot/constants.py +++ b/putil/plot/constants.py @@ -1,5 +1,5 @@ # constants.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,W0105 diff --git a/putil/plot/csv_source.py b/putil/plot/csv_source.py index 5e1bac4..041b936 100644 --- a/putil/plot/csv_source.py +++ b/putil/plot/csv_source.py @@ -1,5 +1,5 @@ # csv_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,E0602,W0105,W0212,W0611 diff --git a/putil/plot/figure.py b/putil/plot/figure.py index 36004e7..a1591a9 100644 --- a/putil/plot/figure.py +++ b/putil/plot/figure.py @@ -1,5 +1,5 @@ # figure.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,R0201,R0914,W0105,W0212 diff --git a/putil/plot/functions.py b/putil/plot/functions.py index 7b663f1..6f9891a 100644 --- a/putil/plot/functions.py +++ b/putil/plot/functions.py @@ -1,5 +1,5 @@ # functions.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,F0401,R0914,W0105,W0212,W0611 diff --git a/putil/plot/panel.py b/putil/plot/panel.py index fcc377a..d876ad3 100644 --- a/putil/plot/panel.py +++ b/putil/plot/panel.py @@ -1,5 +1,5 @@ # panel.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,R0912,R0913,R0914,R0915,W0105,W0212 diff --git a/putil/plot/series.py b/putil/plot/series.py index dcb2821..6f5e446 100644 --- a/putil/plot/series.py +++ b/putil/plot/series.py @@ -1,5 +1,5 @@ # series.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,E0102,E0611,W0105 diff --git a/putil/ptypes.py b/putil/ptypes.py index 5bea9a2..172f976 100644 --- a/putil/ptypes.py +++ b/putil/ptypes.py @@ -1,5 +1,5 @@ # ptypes.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/putil/test.py b/putil/test.py index d98bc98..c8b7458 100644 --- a/putil/test.py +++ b/putil/test.py @@ -1,9 +1,10 @@ # test.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,E0611,F0401 # Standard library imports +from __future__ import print_function import re import sys # PyPI imports @@ -90,7 +91,17 @@ def assert_exception(obj, args, extype, exmsg): def comp_list_of_dicts(list1, list2): """ Compare list of dictionaries """ - return all([item in list1 for item in list2]) + for item in list1: + if item not in list2: + print('List1 item not in list2:') + print(item) + return False + for item in list2: + if item not in list1: + print('List2 item not in list1:') + print(item) + return False + return True def exception_type_str(exobj): diff --git a/putil/tree.py b/putil/tree.py index 3ce86a8..aecaa04 100644 --- a/putil/tree.py +++ b/putil/tree.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # tree.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0913,W0105,W0212 diff --git a/putil/version.py b/putil/version.py index 83ea783..531e9e3 100644 --- a/putil/version.py +++ b/putil/version.py @@ -1,5 +1,5 @@ # version.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 @@ -10,7 +10,7 @@ ### # Global variables ### -VERSION_INFO = (0, 9, 4, 'final', 0) +VERSION_INFO = (0, 9, 5, 'final', 0) ### # Functions diff --git a/sbin/__init__.py b/sbin/__init__.py index 03aac80..cda1dce 100644 --- a/sbin/__init__.py +++ b/sbin/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/build-tags.sh b/sbin/build-tags.sh index 7840120..bc7d970 100755 --- a/sbin/build-tags.sh +++ b/sbin/build-tags.sh @@ -1,6 +1,6 @@ #!/bin/bash # build-tags.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details source $(dirname "${BASH_SOURCE[0]}")/functions.sh diff --git a/sbin/build_docs.py b/sbin/build_docs.py index 2bbafeb..57cbac2 100755 --- a/sbin/build_docs.py +++ b/sbin/build_docs.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # build_docs.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,F0401,R0914,W0141 diff --git a/sbin/build_moddb.py b/sbin/build_moddb.py index b36df29..92b875e 100755 --- a/sbin/build_moddb.py +++ b/sbin/build_moddb.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # build_moddb.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0914 diff --git a/sbin/build_wheel_cache.py b/sbin/build_wheel_cache.py index 0b2e185..a106ae5 100755 --- a/sbin/build_wheel_cache.py +++ b/sbin/build_wheel_cache.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # build_wheel_cache.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/check_files_compliance.py b/sbin/check_files_compliance.py index 6459b9e..cec893a 100755 --- a/sbin/check_files_compliance.py +++ b/sbin/check_files_compliance.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # check_files_compliance.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0912,R0914 diff --git a/sbin/complete-cloning.sh b/sbin/complete-cloning.sh index dbd9fc8..6f81f9c 100755 --- a/sbin/complete-cloning.sh +++ b/sbin/complete-cloning.sh @@ -1,6 +1,6 @@ #!/bin/bash # complete-cloning.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details source $(dirname "${BASH_SOURCE[0]}")/functions.sh diff --git a/sbin/coveragerc_manager.py b/sbin/coveragerc_manager.py index e1c545e..9292485 100755 --- a/sbin/coveragerc_manager.py +++ b/sbin/coveragerc_manager.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # coveragerc_manager.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/cprint.sh b/sbin/cprint.sh index 937ec66..bba1fd2 100755 --- a/sbin/cprint.sh +++ b/sbin/cprint.sh @@ -1,6 +1,6 @@ #!/bin/bash # cprint.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details source $(dirname "${BASH_SOURCE[0]}")/functions.sh diff --git a/sbin/fix_windows_symlinks.py b/sbin/fix_windows_symlinks.py index 21fe44d..8fc6be5 100755 --- a/sbin/fix_windows_symlinks.py +++ b/sbin/fix_windows_symlinks.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # fix_windows_symlinks.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/format_commit_msg.py b/sbin/format_commit_msg.py index 4528043..5c62dc8 100755 --- a/sbin/format_commit_msg.py +++ b/sbin/format_commit_msg.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # format_commit_msg.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,E1101,E1103,F0401,W0212 diff --git a/sbin/functions.py b/sbin/functions.py index 4e33d78..a8a2ca9 100644 --- a/sbin/functions.py +++ b/sbin/functions.py @@ -1,5 +1,5 @@ # functions.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,E0602,E1111,R0904,W0201,W0621 @@ -106,7 +106,7 @@ def gen_manifest(make_wheel=False): fdata = json_load(os.path.join('data', 'data_files.json')) ret = [ '# MANIFEST.in', - '# Copyright (c) 2013-2015 Pablo Acosta-Serafini', + '# Copyright (c) 2013-2016 Pablo Acosta-Serafini', '# See LICENSE for details' ] if not make_wheel: @@ -198,6 +198,8 @@ def shcmd(cmd_list, exmsg, async_stdout=False): sys.stdout.flush() stdout, _ = proc.communicate() retcode = proc.returncode + if sys.hexversion >= 0x03000000: + stdout = stdout.decode('utf-8') if retcode: print(stdout) raise RuntimeError(exmsg) diff --git a/sbin/functions.sh b/sbin/functions.sh index 87485e0..57678cb 100755 --- a/sbin/functions.sh +++ b/sbin/functions.sh @@ -1,6 +1,6 @@ #!/bin/bash # functions.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # Find directory where script is diff --git a/sbin/gen_pkg_manifest.py b/sbin/gen_pkg_manifest.py index 4bcfad4..9bee151 100755 --- a/sbin/gen_pkg_manifest.py +++ b/sbin/gen_pkg_manifest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # gen_pkg_manifest.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/gen_req_files.py b/sbin/gen_req_files.py index 22714ab..7f84152 100755 --- a/sbin/gen_req_files.py +++ b/sbin/gen_req_files.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # gen_req_files.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/patch_pylint.py b/sbin/patch_pylint.py index 4a24daa..3d896cf 100755 --- a/sbin/patch_pylint.py +++ b/sbin/patch_pylint.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # patch_pylint.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/png-to-console.sh b/sbin/png-to-console.sh index ad2496d..ad6f661 100755 --- a/sbin/png-to-console.sh +++ b/sbin/png-to-console.sh @@ -1,6 +1,6 @@ #!/bin/bash # png-to-console.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details file=$1 diff --git a/sbin/refresh_moddb.py b/sbin/refresh_moddb.py index 1b2c500..8440e49 100755 --- a/sbin/refresh_moddb.py +++ b/sbin/refresh_moddb.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # refresh_moddb.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/rtest.sh b/sbin/rtest.sh index a4b5bb9..04aee7e 100755 --- a/sbin/rtest.sh +++ b/sbin/rtest.sh @@ -1,6 +1,6 @@ #!/bin/bash # rtest.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details opath=${PATH} diff --git a/sbin/set-matplotlib-backend.sh b/sbin/set-matplotlib-backend.sh index ba6d1f3..af8921f 100755 --- a/sbin/set-matplotlib-backend.sh +++ b/sbin/set-matplotlib-backend.sh @@ -1,9 +1,9 @@ #!/bin/bash # set-matplotlib-backend.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details echo -e '# matplotlibrc\n'\ -'# Copyright (c) 2013-2015 Pablo Acosta-Serafini\n'\ +'# Copyright (c) 2013-2016 Pablo Acosta-Serafini\n'\ '# See LICENSE for details\n'\ 'backend : Agg' > $1/matplotlibrc diff --git a/sbin/setup-git-hooks.sh b/sbin/setup-git-hooks.sh index 8e4ce86..42dca1b 100755 --- a/sbin/setup-git-hooks.sh +++ b/sbin/setup-git-hooks.sh @@ -1,6 +1,6 @@ #!/bin/bash # setup-git-hooks.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details source $(dirname "${BASH_SOURCE[0]}")/functions.sh diff --git a/sbin/update_copyright_notice.py b/sbin/update_copyright_notice.py index ea351b5..0ced80e 100755 --- a/sbin/update_copyright_notice.py +++ b/sbin/update_copyright_notice.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # update_copyright_notice.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/sbin/update_sphinx_conf.py b/sbin/update_sphinx_conf.py index 9b87c96..5f4a6eb 100755 --- a/sbin/update_sphinx_conf.py +++ b/sbin/update_sphinx_conf.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # update_sphinx_conf.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,F0401,R0914,W0141 diff --git a/sbin/zip-artifacts.sh b/sbin/zip-artifacts.sh index b61a61b..965267e 100755 --- a/sbin/zip-artifacts.sh +++ b/sbin/zip-artifacts.sh @@ -1,6 +1,6 @@ #!/bin/bash # zip-artifacts.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details source $(dirname "${BASH_SOURCE[0]}")/functions.sh diff --git a/setup.cfg b/setup.cfg index 5371aad..9cf3126 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ # setup.cfg -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details [wheel] diff --git a/setup.py b/setup.py index 0bcf49a..b796b48 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # setup.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,E1111,R0904,W0122,W0201,W0621 diff --git a/tests/__init__.py b/tests/__init__.py index 03aac80..cda1dce 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/tests/conftest.py b/tests/conftest.py index 304b3a5..7d4f7a7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,5 @@ # conftest.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0411,E0012,E1101,E1103,F0401,W0212 diff --git a/tests/pcsv/__init__.py b/tests/pcsv/__init__.py index 03aac80..cda1dce 100644 --- a/tests/pcsv/__init__.py +++ b/tests/pcsv/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/tests/pcsv/concatenate.py b/tests/pcsv/concatenate.py index 9fce229..813121e 100644 --- a/tests/pcsv/concatenate.py +++ b/tests/pcsv/concatenate.py @@ -1,5 +1,5 @@ # concatenate.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/pcsv/csv_file.py b/tests/pcsv/csv_file.py index 56de53d..36fbcf0 100644 --- a/tests/pcsv/csv_file.py +++ b/tests/pcsv/csv_file.py @@ -1,5 +1,5 @@ # csv_file.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0204,R0915,W0232 diff --git a/tests/pcsv/dsort.py b/tests/pcsv/dsort.py index b01aafd..25715cb 100644 --- a/tests/pcsv/dsort.py +++ b/tests/pcsv/dsort.py @@ -1,5 +1,5 @@ # dsort.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/pcsv/files.py b/tests/pcsv/files.py index 5874a79..f3d776b 100644 --- a/tests/pcsv/files.py +++ b/tests/pcsv/files.py @@ -1,5 +1,5 @@ # files.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/pcsv/merge.py b/tests/pcsv/merge.py index d77c1b9..67b8e61 100644 --- a/tests/pcsv/merge.py +++ b/tests/pcsv/merge.py @@ -1,5 +1,5 @@ # merge.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/pcsv/replace.py b/tests/pcsv/replace.py index 21d6c93..c3c2341 100644 --- a/tests/pcsv/replace.py +++ b/tests/pcsv/replace.py @@ -1,5 +1,5 @@ # replace.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/pcsv/write.py b/tests/pcsv/write.py index f472d76..152c4c8 100644 --- a/tests/pcsv/write.py +++ b/tests/pcsv/write.py @@ -1,5 +1,5 @@ # write.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,F0401,R0201,R0915,W0232 diff --git a/tests/plot/__init__.py b/tests/plot/__init__.py index bf0453a..65d4902 100644 --- a/tests/plot/__init__.py +++ b/tests/plot/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/tests/plot/basic_source.py b/tests/plot/basic_source.py index fd9200f..ab4d2dc 100644 --- a/tests/plot/basic_source.py +++ b/tests/plot/basic_source.py @@ -1,5 +1,5 @@ # basic_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0201,W0212,W0232,W0612 diff --git a/tests/plot/ccontracts.py b/tests/plot/ccontracts.py index b648296..d31ef47 100644 --- a/tests/plot/ccontracts.py +++ b/tests/plot/ccontracts.py @@ -1,5 +1,5 @@ # ccontracts.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0201,W0212,W0232,W0613 diff --git a/tests/plot/csv_source.py b/tests/plot/csv_source.py index 6a575ca..2485717 100644 --- a/tests/plot/csv_source.py +++ b/tests/plot/csv_source.py @@ -1,5 +1,5 @@ # csv_source.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E0611,F0401 # pylint: disable=R0201,R0904,R0912,R0914,W0212,W0232,W0613 diff --git a/tests/plot/figure.py b/tests/plot/figure.py index f01b761..e0bea14 100644 --- a/tests/plot/figure.py +++ b/tests/plot/figure.py @@ -1,5 +1,5 @@ # figure.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E0611,E1129,F0401,R0201,W0212,W0621 diff --git a/tests/plot/fixtures.py b/tests/plot/fixtures.py index 83f1844..0f7f5ce 100644 --- a/tests/plot/fixtures.py +++ b/tests/plot/fixtures.py @@ -1,5 +1,5 @@ # fixtures.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,E0611,W0621 diff --git a/tests/plot/functions.py b/tests/plot/functions.py index 8612b85..d5c053d 100644 --- a/tests/plot/functions.py +++ b/tests/plot/functions.py @@ -1,5 +1,5 @@ # functions.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0201,R0903,W0621 diff --git a/tests/plot/gen_ref_images.py b/tests/plot/gen_ref_images.py index 86d36bd..1791bf4 100755 --- a/tests/plot/gen_ref_images.py +++ b/tests/plot/gen_ref_images.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # gen_ref_images.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0912,R0914,R0915 diff --git a/tests/plot/panel.py b/tests/plot/panel.py index 301f0d4..32593a4 100644 --- a/tests/plot/panel.py +++ b/tests/plot/panel.py @@ -1,5 +1,5 @@ # panel.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,F0401,R0915,W0212 diff --git a/tests/plot/series.py b/tests/plot/series.py index adfafb0..ef4f607 100644 --- a/tests/plot/series.py +++ b/tests/plot/series.py @@ -1,5 +1,5 @@ # series.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,F0401,R0201,R0204,R0903,W0201,W0212,W0232,W0621 diff --git a/tests/pytest.ini b/tests/pytest.ini index f7ef5ae..09a8485 100644 --- a/tests/pytest.ini +++ b/tests/pytest.ini @@ -1,5 +1,5 @@ # pytest.ini -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details [pytest] diff --git a/tests/support/__init__.py b/tests/support/__init__.py index 03aac80..cda1dce 100644 --- a/tests/support/__init__.py +++ b/tests/support/__init__.py @@ -1,5 +1,5 @@ # __init__.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111 diff --git a/tests/support/compare-image-dirs.sh b/tests/support/compare-image-dirs.sh index 56d0858..c86c2fb 100755 --- a/tests/support/compare-image-dirs.sh +++ b/tests/support/compare-image-dirs.sh @@ -1,6 +1,6 @@ #!/bin/bash # compare-image-dirs.sh -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details exe=../../docs/support/compare_images.py diff --git a/tests/support/exdoc_support_module_1.py b/tests/support/exdoc_support_module_1.py index 3d3f014..5cb1b67 100644 --- a/tests/support/exdoc_support_module_1.py +++ b/tests/support/exdoc_support_module_1.py @@ -1,5 +1,5 @@ # exdoc_support_module_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0613 diff --git a/tests/support/exdoc_support_module_2.py b/tests/support/exdoc_support_module_2.py index 6e3c958..7cabfc9 100644 --- a/tests/support/exdoc_support_module_2.py +++ b/tests/support/exdoc_support_module_2.py @@ -1,5 +1,5 @@ # exdoc_support_module_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/support/exdoc_support_module_3.py b/tests/support/exdoc_support_module_3.py index c8861bd..19c229b 100644 --- a/tests/support/exdoc_support_module_3.py +++ b/tests/support/exdoc_support_module_3.py @@ -1,5 +1,5 @@ # exdoc_support_module_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0212 diff --git a/tests/support/exdoc_support_module_4.py b/tests/support/exdoc_support_module_4.py index 0bd1c54..da7ba1d 100644 --- a/tests/support/exdoc_support_module_4.py +++ b/tests/support/exdoc_support_module_4.py @@ -1,5 +1,5 @@ # exdoc_support_module_4.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0105,W0212 diff --git a/tests/support/exdoc_support_module_5.py b/tests/support/exdoc_support_module_5.py index 6ef47ee..9929afa 100644 --- a/tests/support/exdoc_support_module_5.py +++ b/tests/support/exdoc_support_module_5.py @@ -1,5 +1,5 @@ # exdoc_support_module_5.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0613 diff --git a/tests/support/exh_support_module_1.py b/tests/support/exh_support_module_1.py index a6d802b..d6e65c4 100644 --- a/tests/support/exh_support_module_1.py +++ b/tests/support/exh_support_module_1.py @@ -1,5 +1,5 @@ # exh_support_module_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0612 diff --git a/tests/support/exh_support_module_2.py b/tests/support/exh_support_module_2.py index f00f70c..3d59bf3 100644 --- a/tests/support/exh_support_module_2.py +++ b/tests/support/exh_support_module_2.py @@ -1,5 +1,5 @@ # exh_support_module_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,R0903,W0212,W0611,W0612 diff --git a/tests/support/pinspect_support_module_1.py b/tests/support/pinspect_support_module_1.py index 1f85223..dad33c8 100644 --- a/tests/support/pinspect_support_module_1.py +++ b/tests/support/pinspect_support_module_1.py @@ -1,5 +1,5 @@ # pinspect_support_module_1.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0411,C0413,R0201,R0903,W0212,W0621 diff --git a/tests/support/pinspect_support_module_2.py b/tests/support/pinspect_support_module_2.py index 34e54d8..1aafc54 100644 --- a/tests/support/pinspect_support_module_2.py +++ b/tests/support/pinspect_support_module_2.py @@ -1,5 +1,5 @@ # pinspect_support_module_2.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/support/pinspect_support_module_3.py b/tests/support/pinspect_support_module_3.py index 459b421..0c2ad33 100644 --- a/tests/support/pinspect_support_module_3.py +++ b/tests/support/pinspect_support_module_3.py @@ -1,5 +1,5 @@ # pinspect_support_module_3.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/support/pinspect_support_module_4.py b/tests/support/pinspect_support_module_4.py index 0a41519..f18c2c9 100644 --- a/tests/support/pinspect_support_module_4.py +++ b/tests/support/pinspect_support_module_4.py @@ -1,5 +1,5 @@ # pinspect_support_module_4.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/support/pinspect_support_module_5.py b/tests/support/pinspect_support_module_5.py index be278f8..24328c3 100644 --- a/tests/support/pinspect_support_module_5.py +++ b/tests/support/pinspect_support_module_5.py @@ -1,5 +1,5 @@ # pinspect_support_module_5.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,F0401,W0125,W0212,W0611 diff --git a/tests/support/pinspect_support_module_6.py b/tests/support/pinspect_support_module_6.py index 6a6c778..ce029f1 100644 --- a/tests/support/pinspect_support_module_6.py +++ b/tests/support/pinspect_support_module_6.py @@ -1,5 +1,5 @@ # pinspect_support_module_6.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/support/pinspect_support_module_7.py b/tests/support/pinspect_support_module_7.py index 324d651..6f353b3 100644 --- a/tests/support/pinspect_support_module_7.py +++ b/tests/support/pinspect_support_module_7.py @@ -1,5 +1,5 @@ # pinspect_support_module_7.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0111,R0903,W0212,W0612,W0613 diff --git a/tests/support/pinspect_support_module_8.py b/tests/support/pinspect_support_module_8.py index 7b18619..0f131b1 100644 --- a/tests/support/pinspect_support_module_8.py +++ b/tests/support/pinspect_support_module_8.py @@ -1,5 +1,5 @@ # pinspect_support_module_8.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,F0401,R0903,W0212,W0612 diff --git a/tests/support/pinspect_support_module_9.py b/tests/support/pinspect_support_module_9.py index 39035fd..976bcc4 100644 --- a/tests/support/pinspect_support_module_9.py +++ b/tests/support/pinspect_support_module_9.py @@ -1,5 +1,5 @@ # pinspect_support_module_9.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0201,R0903,W0212,W0621 diff --git a/tests/test_doccode.py b/tests/test_doccode.py index a6ca957..e08740e 100644 --- a/tests/test_doccode.py +++ b/tests/test_doccode.py @@ -1,5 +1,5 @@ # test_doccode.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0302,E1129,R0914,R0915,W0212,W0640 diff --git a/tests/test_eng.py b/tests/test_eng.py index d53c09f..579aca8 100644 --- a/tests/test_eng.py +++ b/tests/test_eng.py @@ -1,5 +1,5 @@ # test_eng.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,R0915,W0212 diff --git a/tests/test_exdoc.py b/tests/test_exdoc.py index 0c885e1..46eac24 100644 --- a/tests/test_exdoc.py +++ b/tests/test_exdoc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # test_exdoc.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,C0411,E0012,E0611,F0401,R0201,R0903,W0104,W0212,W0612,W0613,W0621 diff --git a/tests/test_exh.py b/tests/test_exh.py index a4c46f0..8e54a4a 100644 --- a/tests/test_exh.py +++ b/tests/test_exh.py @@ -1,5 +1,5 @@ # test_exh.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,C0413,E0611,F0401,R0201,R0903,R0912,R0915 # pylint: disable=W0122,W0123,W0212,W0612,W0640 diff --git a/tests/test_misc.py b/tests/test_misc.py index 20932dd..faacad9 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -1,5 +1,5 @@ # test_misc.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,C0302,E0611,E1101,E1129,F0401,R0915,W0621 diff --git a/tests/test_pcontracts.py b/tests/test_pcontracts.py index 9433083..7c75d18 100644 --- a/tests/test_pcontracts.py +++ b/tests/test_pcontracts.py @@ -1,5 +1,5 @@ # test_pcontracts.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E1121,W0212,W0232,W0611,W0612,W0613 @@ -571,26 +571,26 @@ def func5(num, flag=True, fudge=5): ) ref = [ { - 'name':'contract_func5_flag_0', + 'name':'contract:tests.test_pcontracts.func5.flag_0', 'type':RuntimeError, 'msg':'Argument `flag` is not valid' }, { - 'name':'contract_func5_fudge_0', + 'name':'contract:tests.test_pcontracts.func5.fudge_0', 'type':RuntimeError, 'msg':'Argument `fudge` is not valid' }, { - 'name':'contract_func5_num_0', + 'name':'contract:tests.test_pcontracts.func5.num_0', 'type':RuntimeError, 'msg':'Illegal number: unity' }, { - 'name':'contract_func4_fname_0', + 'name':'contract:tests.test_pcontracts.func4.fname_0', 'type':OSError, 'msg':'File name `*[file_name]*` not found' }, { - 'name':'contract_func4_fname_1', + 'name':'contract:tests.test_pcontracts.func4.fname_1', 'type':RuntimeError, 'msg':'The argument fname is wrong' } diff --git a/tests/test_pcsv.py b/tests/test_pcsv.py index 365df4c..8a677e0 100644 --- a/tests/test_pcsv.py +++ b/tests/test_pcsv.py @@ -1,5 +1,5 @@ # test_pcsv.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0611 diff --git a/tests/test_pinspect.py b/tests/test_pinspect.py index 17800eb..34e1551 100644 --- a/tests/test_pinspect.py +++ b/tests/test_pinspect.py @@ -1,5 +1,5 @@ # test_pinspect.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,E0611,F0401,R0201,R0903,R0913,R0915,W0104,W0212,W0232,W0612,W0613,W0621 @@ -433,7 +433,7 @@ def test_repr(self): assert repr(xobj) == ref def test_str_empty(self): - """ Test __str__() magic method when object is empty """ + """ Test __str__ magic method when object is empty """ obj = putil.pinspect.Callables() assert str(obj) == '' @@ -461,11 +461,16 @@ def test_refresh(self): ' putil.pit.MyClass\n' 'putil.pit.MyClass: class (1-2)\n' 'putil.pit.func1: func (3-4)\n' - 'putil.test.assert_exception: func (21-90)\n' - 'putil.test.comp_list_of_dicts: func (91-95)\n' - 'putil.test.exception_type_str: func (96-113)\n' - 'putil.test.get_exmsg: func (114-116)' + 'putil.test.assert_exception: func (22-91)\n' + 'putil.test.comp_list_of_dicts: func (92-106)\n' + 'putil.test.exception_type_str: func (107-124)\n' + 'putil.test.get_exmsg: func (125-127)' ) + if str(obj) != rtext: + print('Actual text:') + print(obj) + print('Reference text:') + print(rtext) assert str(obj) == rtext os.remove(src) time.sleep(0.5) @@ -478,11 +483,16 @@ def test_refresh(self): ' putil.pit\n' ' putil.test\n' 'putil.pit.my_func: func (1-2)\n' - 'putil.test.assert_exception: func (21-90)\n' - 'putil.test.comp_list_of_dicts: func (91-95)\n' - 'putil.test.exception_type_str: func (96-113)\n' - 'putil.test.get_exmsg: func (114-116)' + 'putil.test.assert_exception: func (22-91)\n' + 'putil.test.comp_list_of_dicts: func (92-106)\n' + 'putil.test.exception_type_str: func (107-124)\n' + 'putil.test.get_exmsg: func (125-127)' ) + if str(obj) != rtext: + print('Actual text:') + print(obj) + print('Reference text:') + print(rtext) assert str(obj) == rtext ## Test malformed JSON file obj = putil.pinspect.Callables() diff --git a/tests/test_plot.py b/tests/test_plot.py index b194c0f..d617b1b 100644 --- a/tests/test_plot.py +++ b/tests/test_plot.py @@ -1,5 +1,5 @@ # test_plot.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0611 diff --git a/tests/test_ptypes.py b/tests/test_ptypes.py index 72357d5..b8b0e7f 100644 --- a/tests/test_ptypes.py +++ b/tests/test_ptypes.py @@ -1,5 +1,5 @@ # test_ptypes.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111 diff --git a/tests/test_test.py b/tests/test_test.py index 68885f6..583badf 100644 --- a/tests/test_test.py +++ b/tests/test_test.py @@ -1,5 +1,5 @@ # test_test.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0111,W0212 diff --git a/tests/test_tree.py b/tests/test_tree.py index 7810ae8..6ea66b1 100644 --- a/tests/test_tree.py +++ b/tests/test_tree.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # test_tree.py -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details # pylint: disable=C0103,C0111,R0201,R0904,R0914,W0212,W0232,W0621 diff --git a/tox.ini b/tox.ini index bfe7205..2ab51a1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ # tox.ini -# Copyright (c) 2013-2015 Pablo Acosta-Serafini +# Copyright (c) 2013-2016 Pablo Acosta-Serafini # See LICENSE for details [tox]