commit python-python-gammu for openSUSE:Factory
Hello community, here is the log from the commit of package python-python-gammu for openSUSE:Factory checked in at 2017-01-25 23:22:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-python-gammu (Old) and /work/SRC/openSUSE:Factory/.python-python-gammu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-python-gammu" Changes: -------- --- /work/SRC/openSUSE:Factory/python-python-gammu/python-python-gammu.changes 2016-05-31 12:24:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-python-gammu.new/python-python-gammu.changes 2017-01-25 23:22:09.281460251 +0100 @@ -1,0 +2,7 @@ +Fri Nov 25 22:16:36 UTC 2016 - ecsos@opensuse.org + +- Update to 2.7 + * Compatibility with Gammu >= 1.37.90 +- change source url to url that work + +------------------------------------------------------------------- Old: ---- python-gammu-2.5.tar.bz2 New: ---- python-gammu-2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-python-gammu.spec ++++++ --- /var/tmp/diff_new_pack.s2c8pA/_old 2017-01-25 23:22:09.661402955 +0100 +++ /var/tmp/diff_new_pack.s2c8pA/_new 2017-01-25 23:22:09.669401748 +0100 @@ -17,14 +17,14 @@ Name: python-python-gammu -Version: 2.5 +Version: 2.7 Release: 0 Summary: Python module to communicate with mobile phones License: GPL-2.0+ Group: Development/Languages/Python Url: http://wammu.eu/python-gammu/ -Source: https://pypi.python.org/packages/source/p/python-gammu/python-gammu-%{version}.tar.bz2 -BuildRequires: gammu-devel >= 1.34.0 +Source: https://pypi.io/packages/source/p/python-gammu/python-gammu-%{version}.tar.bz2 +BuildRequires: gammu-devel >= 1.37.90 BuildRequires: libdbi-drivers-dbd-sqlite3 BuildRequires: pkg-config BuildRequires: python-devel ++++++ python-gammu-2.5.tar.bz2 -> python-gammu-2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/NEWS.rst new/python-gammu-2.7/NEWS.rst --- old/python-gammu-2.5/NEWS.rst 2016-01-19 14:42:44.000000000 +0100 +++ new/python-gammu-2.7/NEWS.rst 2016-10-23 15:06:03.000000000 +0200 @@ -1,3 +1,14 @@ +2.7 +=== + +* Needs Gammu >= 1.37.90 due to API changes. + +2.6 +=== + +* Fixed error when creating new contact. +* Fixed possible testsuite errors. + 2.5 === diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/PKG-INFO new/python-gammu-2.7/PKG-INFO --- old/python-gammu-2.5/PKG-INFO 2016-01-19 15:17:05.000000000 +0100 +++ new/python-gammu-2.7/PKG-INFO 2016-10-23 15:07:57.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-gammu -Version: 2.5 +Version: 2.7 Summary: Gammu bindings Home-page: http://wammu.eu/python-gammu/ Author: Michal Čihař @@ -53,7 +53,7 @@ License ======= - Copyright (C) 2003 - 2015 Michal Čihař + Copyright (C) 2003 - 2016 Michal Čihař This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/README.rst new/python-gammu-2.7/README.rst --- old/python-gammu-2.5/README.rst 2016-01-19 14:25:58.000000000 +0100 +++ new/python-gammu-2.7/README.rst 2016-10-11 13:14:23.000000000 +0200 @@ -44,7 +44,7 @@ License ======= -Copyright (C) 2003 - 2015 Michal Čihař +Copyright (C) 2003 - 2016 Michal Čihař This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/__init__.py new/python-gammu-2.7/examples/__init__.py --- old/python-gammu-2.5/examples/__init__.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/__init__.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/addcontacts.py new/python-gammu-2.7/examples/addcontacts.py --- old/python-gammu-2.5/examples/addcontacts.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/addcontacts.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/addfile.py new/python-gammu-2.7/examples/addfile.py --- old/python-gammu-2.5/examples/addfile.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/addfile.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/backup_convertor.py new/python-gammu-2.7/examples/backup_convertor.py --- old/python-gammu-2.5/examples/backup_convertor.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/backup_convertor.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/batteryinfo.py new/python-gammu-2.7/examples/batteryinfo.py --- old/python-gammu-2.5/examples/batteryinfo.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/batteryinfo.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/debugging.py new/python-gammu-2.7/examples/debugging.py --- old/python-gammu-2.5/examples/debugging.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/debugging.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/dialvoice.py new/python-gammu-2.7/examples/dialvoice.py --- old/python-gammu-2.5/examples/dialvoice.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/dialvoice.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/doc-exceptions.py new/python-gammu-2.7/examples/doc-exceptions.py --- old/python-gammu-2.5/examples/doc-exceptions.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/doc-exceptions.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/dummy_phone.py new/python-gammu-2.7/examples/dummy_phone.py --- old/python-gammu-2.5/examples/dummy_phone.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/dummy_phone.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/filesystem_test.py new/python-gammu-2.7/examples/filesystem_test.py --- old/python-gammu-2.5/examples/filesystem_test.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/filesystem_test.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Matthias Blaesing <matthias.blaesing@rwth-aachen.de> +# Copyright © 2003 - 2016 Matthias Blaesing <matthias.blaesing@rwth-aachen.de> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getallcalendar.py new/python-gammu-2.7/examples/getallcalendar.py --- old/python-gammu-2.5/examples/getallcalendar.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getallcalendar.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getallmemory.py new/python-gammu-2.7/examples/getallmemory.py --- old/python-gammu-2.5/examples/getallmemory.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getallmemory.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getallmemory_nonext.py new/python-gammu-2.7/examples/getallmemory_nonext.py --- old/python-gammu-2.5/examples/getallmemory_nonext.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getallmemory_nonext.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getallsms.py new/python-gammu-2.7/examples/getallsms.py --- old/python-gammu-2.5/examples/getallsms.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getallsms.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getallsms_decode.py new/python-gammu-2.7/examples/getallsms_decode.py --- old/python-gammu-2.5/examples/getallsms_decode.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getallsms_decode.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getalltodo.py new/python-gammu-2.7/examples/getalltodo.py --- old/python-gammu-2.5/examples/getalltodo.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getalltodo.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/getdiverts.py new/python-gammu-2.7/examples/getdiverts.py --- old/python-gammu-2.5/examples/getdiverts.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/getdiverts.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/incoming.py new/python-gammu-2.7/examples/incoming.py --- old/python-gammu-2.5/examples/incoming.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/incoming.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/listfilesystem.py new/python-gammu-2.7/examples/listfilesystem.py --- old/python-gammu-2.5/examples/listfilesystem.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/listfilesystem.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Matthias Blaesing <matthias.blaesing@rwth-aachen.de> +# Copyright © 2003 - 2016 Matthias Blaesing <matthias.blaesing@rwth-aachen.de> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/mass_sms.py new/python-gammu-2.7/examples/mass_sms.py --- old/python-gammu-2.5/examples/mass_sms.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/mass_sms.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/pdu_decoder.py new/python-gammu-2.7/examples/pdu_decoder.py --- old/python-gammu-2.5/examples/pdu_decoder.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/pdu_decoder.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/read_sms_backup.py new/python-gammu-2.7/examples/read_sms_backup.py --- old/python-gammu-2.5/examples/read_sms_backup.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/read_sms_backup.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/savesmspercontact.py new/python-gammu-2.7/examples/savesmspercontact.py --- old/python-gammu-2.5/examples/savesmspercontact.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/savesmspercontact.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/sendlongsms.py new/python-gammu-2.7/examples/sendlongsms.py --- old/python-gammu-2.5/examples/sendlongsms.py 2016-01-19 14:25:58.000000000 +0100 +++ new/python-gammu-2.7/examples/sendlongsms.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/sendsms.py new/python-gammu-2.7/examples/sendsms.py --- old/python-gammu-2.5/examples/sendsms.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/sendsms.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/service_numbers.py new/python-gammu-2.7/examples/service_numbers.py --- old/python-gammu-2.5/examples/service_numbers.py 2016-01-19 14:25:58.000000000 +0100 +++ new/python-gammu-2.7/examples/service_numbers.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/setdiverts.py new/python-gammu-2.7/examples/setdiverts.py --- old/python-gammu-2.5/examples/setdiverts.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/setdiverts.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/sms_replier.py new/python-gammu-2.7/examples/sms_replier.py --- old/python-gammu-2.5/examples/sms_replier.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/sms_replier.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/smsbackup.py new/python-gammu-2.7/examples/smsbackup.py --- old/python-gammu-2.5/examples/smsbackup.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/smsbackup.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/smsd_inject.py new/python-gammu-2.7/examples/smsd_inject.py --- old/python-gammu-2.5/examples/smsd_inject.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/smsd_inject.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/smsd_state.py new/python-gammu-2.7/examples/smsd_state.py --- old/python-gammu-2.5/examples/smsd_state.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/smsd_state.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/vcs.py new/python-gammu-2.7/examples/vcs.py --- old/python-gammu-2.5/examples/vcs.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/vcs.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/examples/worker.py new/python-gammu-2.7/examples/worker.py --- old/python-gammu-2.5/examples/worker.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/examples/worker.py 2016-05-24 14:54:49.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/__init__.py new/python-gammu-2.7/gammu/__init__.py --- old/python-gammu-2.5/gammu/__init__.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/__init__.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/data.py new/python-gammu-2.7/gammu/data.py --- old/python-gammu-2.5/gammu/data.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/data.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/exception.py new/python-gammu-2.7/gammu/exception.py --- old/python-gammu-2.5/gammu/exception.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/exception.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/smsd.py new/python-gammu-2.7/gammu/smsd.py --- old/python-gammu-2.5/gammu/smsd.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/smsd.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/backup.c new/python-gammu-2.7/gammu/src/convertors/backup.c --- old/python-gammu-2.5/gammu/src/convertors/backup.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/backup.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/base.c new/python-gammu-2.7/gammu/src/convertors/base.c --- old/python-gammu-2.5/gammu/src/convertors/base.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/base.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/bitmap.c new/python-gammu-2.7/gammu/src/convertors/bitmap.c --- old/python-gammu-2.5/gammu/src/convertors/bitmap.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/bitmap.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/calendar.c new/python-gammu-2.7/gammu/src/convertors/calendar.c --- old/python-gammu-2.5/gammu/src/convertors/calendar.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/calendar.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/call.c new/python-gammu-2.7/gammu/src/convertors/call.c --- old/python-gammu-2.5/gammu/src/convertors/call.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/call.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/diverts.c new/python-gammu-2.7/gammu/src/convertors/diverts.c --- old/python-gammu-2.5/gammu/src/convertors/diverts.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/diverts.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/file.c new/python-gammu-2.7/gammu/src/convertors/file.c --- old/python-gammu-2.5/gammu/src/convertors/file.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/file.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/memory.c new/python-gammu-2.7/gammu/src/convertors/memory.c --- old/python-gammu-2.5/gammu/src/convertors/memory.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/memory.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -407,17 +407,18 @@ location = GetCharFromDict(item, "Location"); if (location == NULL) { - entry->Entries[i].Location = PBK_Location_Unknown; - } else { - if (strcmp(location, "Home") == 0) { - entry->Entries[i].Location = PBK_Location_Home; - } else if (strcmp(location, "Work") == 0) { - entry->Entries[i].Location = PBK_Location_Work; - } else { - entry->Entries[i].Location = PBK_Location_Unknown; - } - free(location); - } + PyErr_Clear(); + entry->Entries[i].Location = PBK_Location_Unknown; + } else { + if (strcmp(location, "Home") == 0) { + entry->Entries[i].Location = PBK_Location_Home; + } else if (strcmp(location, "Work") == 0) { + entry->Entries[i].Location = PBK_Location_Work; + } else { + entry->Entries[i].Location = PBK_Location_Unknown; + } + free(location); + } /* Zero everything, just to be sure */ entry->Entries[i].Text[0] = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/misc.c new/python-gammu-2.7/gammu/src/convertors/misc.c --- old/python-gammu-2.5/gammu/src/convertors/misc.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/misc.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/ringtone.c new/python-gammu-2.7/gammu/src/convertors/ringtone.c --- old/python-gammu-2.5/gammu/src/convertors/ringtone.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/ringtone.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/sms.c new/python-gammu-2.7/gammu/src/convertors/sms.c --- old/python-gammu-2.5/gammu/src/convertors/sms.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/sms.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/string.c new/python-gammu-2.7/gammu/src/convertors/string.c --- old/python-gammu-2.5/gammu/src/convertors/string.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/string.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/time.c new/python-gammu-2.7/gammu/src/convertors/time.c --- old/python-gammu-2.5/gammu/src/convertors/time.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/time.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/todo.c new/python-gammu-2.7/gammu/src/convertors/todo.c --- old/python-gammu-2.5/gammu/src/convertors/todo.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/todo.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/convertors/wap.c new/python-gammu-2.7/gammu/src/convertors/wap.c --- old/python-gammu-2.5/gammu/src/convertors/wap.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/convertors/wap.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/data.c new/python-gammu-2.7/gammu/src/data.c --- old/python-gammu-2.5/gammu/src/data.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/data.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/errors.c new/python-gammu-2.7/gammu/src/errors.c --- old/python-gammu-2.5/gammu/src/errors.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/errors.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/gammu.c new/python-gammu-2.7/gammu/src/gammu.c --- old/python-gammu-2.5/gammu/src/gammu.c 2016-01-19 14:25:58.000000000 +0100 +++ new/python-gammu-2.7/gammu/src/gammu.c 2016-10-20 17:52:12.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -4750,7 +4750,8 @@ static char *kwlist[] = {"File", NULL}; PyObject *value, *result; GSM_File File; - int handle, size; + int handle; + size_t size; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist, &PyDict_Type, &(value))) @@ -4825,7 +4826,8 @@ static char *kwlist[] = {"File", NULL}; PyObject *value, *result; GSM_File File; - int handle, pos; + int handle; + size_t pos; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist, &PyDict_Type, &(value))) @@ -4900,7 +4902,8 @@ static char *kwlist[] = {"File", NULL}; PyObject *value, *result; GSM_File File; - int handle, pos; + int handle; + size_t pos; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist, &PyDict_Type, &(value))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/misc.c new/python-gammu-2.7/gammu/src/misc.c --- old/python-gammu-2.5/gammu/src/misc.c 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/misc.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/src/smsd.c new/python-gammu-2.7/gammu/src/smsd.c --- old/python-gammu-2.5/gammu/src/smsd.c 2015-10-01 17:05:55.000000000 +0200 +++ new/python-gammu-2.7/gammu/src/smsd.c 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary, SMSD part - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/gammu/worker.py new/python-gammu-2.7/gammu/worker.py --- old/python-gammu-2.5/gammu/worker.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/gammu/worker.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/include/convertors.h new/python-gammu-2.7/include/convertors.h --- old/python-gammu-2.5/include/convertors.h 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/include/convertors.h 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/include/data.h new/python-gammu-2.7/include/data.h --- old/python-gammu-2.5/include/data.h 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/include/data.h 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/include/errors.h new/python-gammu-2.7/include/errors.h --- old/python-gammu-2.5/include/errors.h 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/include/errors.h 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/include/misc.h new/python-gammu-2.7/include/misc.h --- old/python-gammu-2.5/include/misc.h 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/include/misc.h 2016-05-24 14:54:49.000000000 +0200 @@ -1,6 +1,6 @@ /* * python-gammu - Phone communication libary - * Copyright (C) 2003 - 2015 Michal Čihař + * Copyright (C) 2003 - 2016 Michal Čihař * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/python_gammu.egg-info/PKG-INFO new/python-gammu-2.7/python_gammu.egg-info/PKG-INFO --- old/python-gammu-2.5/python_gammu.egg-info/PKG-INFO 2016-01-19 15:17:05.000000000 +0100 +++ new/python-gammu-2.7/python_gammu.egg-info/PKG-INFO 2016-10-23 15:07:57.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-gammu -Version: 2.5 +Version: 2.7 Summary: Gammu bindings Home-page: http://wammu.eu/python-gammu/ Author: Michal Čihař @@ -53,7 +53,7 @@ License ======= - Copyright (C) 2003 - 2015 Michal Čihař + Copyright (C) 2003 - 2016 Michal Čihař This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/python_gammu.egg-info/SOURCES.txt new/python-gammu-2.7/python_gammu.egg-info/SOURCES.txt --- old/python-gammu-2.5/python_gammu.egg-info/SOURCES.txt 2016-01-19 15:17:05.000000000 +0100 +++ new/python-gammu-2.7/python_gammu.egg-info/SOURCES.txt 2016-10-23 15:07:57.000000000 +0200 @@ -80,7 +80,6 @@ test/test_sms.py test/test_smsd.py test/test_worker.py -test/data/.sqlite.sql.swp test/data/02.vcs test/data/UK32Holidays.ics test/data/bug-779.vcf @@ -89,6 +88,7 @@ test/data/rrule.ics test/data/sqlite-14.sql test/data/sqlite-15.sql +test/data/sqlite-16.sql test/data/gammu-dummy/calendar/2 test/data/gammu-dummy/calendar/22 test/data/gammu-dummy/fs/file5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/setup.py new/python-gammu-2.7/setup.py --- old/python-gammu-2.5/setup.py 2015-10-01 15:05:24.000000000 +0200 +++ new/python-gammu-2.7/setup.py 2016-10-20 17:52:10.000000000 +0200 @@ -2,7 +2,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # @@ -30,8 +30,8 @@ import codecs # some defines -VERSION = '2.5' -GAMMU_REQUIRED = '1.34.0' +VERSION = '2.7' +GAMMU_REQUIRED = '1.37.90' README_FILE = os.path.join(os.path.dirname(__file__), 'README.rst') with codecs.open(README_FILE, 'r', 'utf-8') as readme: README = readme.read() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/__init__.py new/python-gammu-2.7/test/__init__.py --- old/python-gammu-2.5/test/__init__.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/__init__.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # Binary files old/python-gammu-2.5/test/data/.sqlite.sql.swp and new/python-gammu-2.7/test/data/.sqlite.sql.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/data/sqlite-16.sql new/python-gammu-2.7/test/data/sqlite-16.sql --- old/python-gammu-2.5/test/data/sqlite-16.sql 1970-01-01 01:00:00.000000000 +0100 +++ new/python-gammu-2.7/test/data/sqlite-16.sql 2016-09-10 13:13:03.000000000 +0200 @@ -0,0 +1,135 @@ +CREATE TABLE gammu ( + Version INTEGER NOT NULL DEFAULT '0' PRIMARY KEY +); + +INSERT INTO gammu (Version) VALUES (16); + +CREATE TABLE inbox ( + UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), + ReceivingDateTime NUMERIC NOT NULL DEFAULT (datetime('now')), + Text TEXT NOT NULL, + SenderNumber TEXT NOT NULL DEFAULT '', + Coding TEXT NOT NULL DEFAULT 'Default_No_Compression', + UDH TEXT NOT NULL, + SMSCNumber TEXT NOT NULL DEFAULT '', + Class INTEGER NOT NULL DEFAULT '-1', + TextDecoded TEXT NOT NULL DEFAULT '', + ID INTEGER PRIMARY KEY AUTOINCREMENT, + RecipientID TEXT NOT NULL, + Processed TEXT NOT NULL DEFAULT 'false', + CHECK (Coding IN + ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')) +); + +CREATE TRIGGER update_inbox_time UPDATE ON inbox + BEGIN + UPDATE inbox SET UpdatedInDB = datetime('now') WHERE ID = old.ID; + END; + +CREATE TABLE outbox ( + UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), + InsertIntoDB NUMERIC NOT NULL DEFAULT (datetime('now')), + SendingDateTime NUMERIC NOT NULL DEFAULT (datetime('now')), + SendBefore time NOT NULL DEFAULT '23:59:59', + SendAfter time NOT NULL DEFAULT '00:00:00', + Text TEXT, + DestinationNumber TEXT NOT NULL DEFAULT '', + Coding TEXT NOT NULL DEFAULT 'Default_No_Compression', + UDH TEXT, + Class INTEGER DEFAULT '-1', + TextDecoded TEXT NOT NULL DEFAULT '', + ID INTEGER PRIMARY KEY AUTOINCREMENT, + MultiPart TEXT NOT NULL DEFAULT 'false', + RelativeValidity INTEGER DEFAULT '-1', + SenderID TEXT, + SendingTimeOut NUMERIC NOT NULL DEFAULT (datetime('now')), + DeliveryReport TEXT DEFAULT 'default', + CreatorID TEXT NOT NULL, + Retries INTEGER DEFAULT '0', + Priority INTEGER DEFAULT '0', + CHECK (Coding IN + ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')), + CHECK (DeliveryReport IN ('default','yes','no')) +); + +CREATE INDEX outbox_date ON outbox(SendingDateTime, SendingTimeOut); +CREATE INDEX outbox_sender ON outbox(SenderID); + +CREATE TRIGGER update_outbox_time UPDATE ON outbox + BEGIN + UPDATE outbox SET UpdatedInDB = datetime('now') WHERE ID = old.ID; + END; + +CREATE TABLE outbox_multipart ( + Text TEXT, + Coding TEXT NOT NULL DEFAULT 'Default_No_Compression', + UDH TEXT, + Class INTEGER DEFAULT '-1', + TextDecoded TEXT DEFAULT NULL, + ID INTEGER, + SequencePosition INTEGER NOT NULL DEFAULT '1', + CHECK (Coding IN + ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')), + PRIMARY KEY (ID, SequencePosition) +); + +CREATE TABLE phones ( + ID TEXT NOT NULL, + UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), + InsertIntoDB NUMERIC NOT NULL DEFAULT (datetime('now')), + TimeOut NUMERIC NOT NULL DEFAULT (datetime('now')), + Send TEXT NOT NULL DEFAULT 'no', + Receive TEXT NOT NULL DEFAULT 'no', + IMEI TEXT PRIMARY KEY NOT NULL, + IMSI TEXT NOT NULL, + NetCode TEXT DEFAULT 'ERROR', + NetName TEXT DEFAULT 'ERROR', + Client TEXT NOT NULL, + Battery INTEGER NOT NULL DEFAULT -1, + Signal INTEGER NOT NULL DEFAULT -1, + Sent INTEGER NOT NULL DEFAULT 0, + Received INTEGER NOT NULL DEFAULT 0 +); + +CREATE TRIGGER update_phones_time UPDATE ON phones + BEGIN + UPDATE phones SET UpdatedInDB = datetime('now') WHERE IMEI = old.IMEI; + END; + +CREATE TABLE sentitems ( + UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')), + InsertIntoDB NUMERIC NOT NULL DEFAULT (datetime('now')), + SendingDateTime NUMERIC NOT NULL DEFAULT (datetime('now')), + DeliveryDateTime NUMERIC NULL, + Text TEXT NOT NULL, + DestinationNumber TEXT NOT NULL DEFAULT '', + Coding TEXT NOT NULL DEFAULT 'Default_No_Compression', + UDH TEXT NOT NULL, + SMSCNumber TEXT NOT NULL DEFAULT '', + Class INTEGER NOT NULL DEFAULT '-1', + TextDecoded TEXT NOT NULL DEFAULT '', + ID INTEGER, + SenderID TEXT NOT NULL, + SequencePosition INTEGER NOT NULL DEFAULT '1', + Status TEXT NOT NULL DEFAULT 'SendingOK', + StatusError INTEGER NOT NULL DEFAULT '-1', + TPMR INTEGER NOT NULL DEFAULT '-1', + RelativeValidity INTEGER NOT NULL DEFAULT '-1', + CreatorID TEXT NOT NULL, + CHECK (Status IN + ('SendingOK','SendingOKNoReport','SendingError','DeliveryOK','DeliveryFailed','DeliveryPending', + 'DeliveryUnknown','Error')), + CHECK (Coding IN + ('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression')) , + PRIMARY KEY (ID, SequencePosition) +); + +CREATE INDEX sentitems_date ON sentitems(DeliveryDateTime); +CREATE INDEX sentitems_tpmr ON sentitems(TPMR); +CREATE INDEX sentitems_dest ON sentitems(DestinationNumber); +CREATE INDEX sentitems_sender ON sentitems(SenderID); + +CREATE TRIGGER update_sentitems_time UPDATE ON sentitems + BEGIN + UPDATE sentitems SET UpdatedInDB = datetime('now') WHERE ID = old.ID; + END; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_backup.py new/python-gammu-2.7/test/test_backup.py --- old/python-gammu-2.5/test/test_backup.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/test_backup.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_config.py new/python-gammu-2.7/test/test_config.py --- old/python-gammu-2.5/test/test_config.py 2015-10-01 15:05:24.000000000 +0200 +++ new/python-gammu-2.7/test/test_config.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # @@ -106,6 +106,7 @@ gammu.SetDebugFile(testfile.file) self.check_operation(testfile.name) finally: + gammu.SetDebugFile(None) testfile.close() def test_filename(self): @@ -114,6 +115,7 @@ gammu.SetDebugFile(testfile.name) self.check_operation(testfile.name) finally: + gammu.SetDebugFile(None) testfile.close() def test_none(self): @@ -129,4 +131,5 @@ with open(testfile.name, 'r') as handle: self.assertEqual('', handle.read()) finally: + gammu.SetDebugFile(None) testfile.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_data.py new/python-gammu-2.7/test/test_data.py --- old/python-gammu-2.5/test/test_data.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/test_data.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_dummy.py new/python-gammu-2.7/test/test_dummy.py --- old/python-gammu-2.5/test/test_dummy.py 2016-01-19 14:41:52.000000000 +0100 +++ new/python-gammu-2.7/test/test_dummy.py 2016-10-20 18:59:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # @@ -41,7 +41,7 @@ [smsd] commtimeout = 1 -debuglevel = 0 +debuglevel = 255 logfile = stderr service = sql driver = sqlite3 @@ -54,12 +54,14 @@ class DummyTest(unittest.TestCase): test_dir = None config_name = None + dummy_dir = None + _called = False def setUp(self): self.test_dir = tempfile.mkdtemp() - dummy_dir = os.path.join(self.test_dir, 'gammu-dummy') + self.dummy_dir = os.path.join(self.test_dir, 'gammu-dummy') self.config_name = os.path.join(self.test_dir, '.gammurc') - shutil.copytree(DUMMY_DIR, dummy_dir) + shutil.copytree(DUMMY_DIR, self.dummy_dir) with open(self.config_name, 'w') as handle: handle.write(CONFIGURATION.format(path=self.test_dir)) @@ -72,10 +74,30 @@ state_machine.Init() return state_machine + def fake_incoming_call(self): + """Fake incoming call""" + filename = os.path.join(self.dummy_dir, 'incoming-call') + with open(filename, 'w') as handle: + handle.write('\n') + + def check_incoming_call(self): + """Checks whether incoming call faking is supported""" + current = tuple([int(x) for x in gammu.Version()[2].split('.')]) + if current < (1, 37, 91): + raise unittest.SkipTest( + 'Not supported in version {0}'.format(gammu.Version()[2]) + ) + + def call_callback(self, state_machine, response, data): + ''' + Callback on USSD data. + ''' + self._called = True + self.assertEqual(response, 'Call') + self.assertEqual(data['Number'], '+800123456') -class BasicDummyTest(DummyTest): - _called = False +class BasicDummyTest(DummyTest): def test_model(self): state_machine = self.get_statemachine() self.assertEqual(state_machine.GetModel()[1], 'Dummy') @@ -147,6 +169,22 @@ ) remain = remain - 1 + def test_getmemory(self): + state_machine = self.get_statemachine() + + location = state_machine.AddMemory( + { + 'MemoryType': 'SM', + 'Entries': [ + {'Type': 'Number_Mobile', 'Value': '123456'}, + {'Type': 'Text_Name', 'Value': 'Jmeno'}, + ] + } + ) + + read = state_machine.GetMemory('SM', location) + self.assertEqual(len(read['Entries']), 2) + def test_calendar(self): state_machine = self.get_statemachine() status = state_machine.GetCalendarStatus() @@ -364,3 +402,14 @@ break self.assertEqual(folders, 3) self.assertEqual(files, 6) + + def test_incoming_call(self): + self.check_incoming_call() + self._called = False + state_machine = self.get_statemachine() + state_machine.SetIncomingCallback(self.call_callback) + state_machine.SetIncomingCall() + state_machine.GetSignalQuality() + self.fake_incoming_call() + state_machine.GetSignalQuality() + self.assertTrue(self._called) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_errors.py new/python-gammu-2.7/test/test_errors.py --- old/python-gammu-2.5/test/test_errors.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/test_errors.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_sms.py new/python-gammu-2.7/test/test_sms.py --- old/python-gammu-2.5/test/test_sms.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/test_sms.py 2016-05-24 14:54:49.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_smsd.py new/python-gammu-2.7/test/test_smsd.py --- old/python-gammu-2.5/test/test_smsd.py 2016-01-19 14:40:33.000000000 +0100 +++ new/python-gammu-2.7/test/test_smsd.py 2016-10-20 19:49:02.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # @@ -19,6 +19,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +from __future__ import print_function from .test_dummy import DummyTest import gammu.smsd import os @@ -51,8 +52,12 @@ if version < (1, 36, 7): dbver = 14 - else: + elif version < (1, 37, 90): dbver = 15 + else: + dbver = 16 + + print('Gammu version {0}, SMSD DB version {1}'.format(version, dbver)) return os.path.join( os.path.dirname(__file__), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-gammu-2.5/test/test_worker.py new/python-gammu-2.7/test/test_worker.py --- old/python-gammu-2.5/test/test_worker.py 2015-06-26 15:06:20.000000000 +0200 +++ new/python-gammu-2.7/test/test_worker.py 2016-10-20 19:08:14.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: UTF-8 -*- # vim: expandtab sw=4 ts=4 sts=4: # -# Copyright © 2003 - 2015 Michal Čihař <michal@cihar.com> +# Copyright © 2003 - 2016 Michal Čihař <michal@cihar.com> # # This file is part of python-gammu <http://wammu.eu/python-gammu/> # @@ -303,6 +303,7 @@ self.results.append((name, result, error, percents)) def test_worker(self): + self.results = [] worker = gammu.worker.GammuWorker(self.callback) worker.configure(self.get_statemachine().GetConfig()) # We can directly invoke commands @@ -344,3 +345,16 @@ self.maxDiff = None self.assertEqual(WORKER_EXPECT, self.results) + + def test_incoming(self): + self.check_incoming_call() + self.results = [] + self._called = False + worker = gammu.worker.GammuWorker(self.callback) + worker.configure(self.get_statemachine().GetConfig()) + worker.initiate() + worker.enqueue('SetIncomingCallback', (self.call_callback, )) + worker.enqueue('SetIncomingCall') + self.fake_incoming_call() + worker.terminate() + self.assertTrue(self._called)
participants (1)
-
root＠hilbertn.suse.de