Hello community,
here is the log from the commit of package python-gammu
checked in at Tue Mar 11 17:54:14 CET 2008.
--------
--- python-gammu/python-gammu.changes 2007-12-18 12:08:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/python-gammu/python-gammu.changes 2008-03-11 14:45:50.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Mar 11 14:45:20 CET 2008 - prusnak@suse.cz
+
+- updated to 0.25
+ * Compatibility with current gammu.
+ * Fixed Gammu version reported by python-gammu.
+
+-------------------------------------------------------------------
Old:
----
python-gammu-0.24.tar.bz2
New:
----
python-gammu-0.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-gammu.spec ++++++
--- /var/tmp/diff_new_pack.sr3037/_old 2008-03-11 17:53:18.000000000 +0100
+++ /var/tmp/diff_new_pack.sr3037/_new 2008-03-11 17:53:18.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package python-gammu (Version 0.24)
+# spec file for package python-gammu (Version 0.25)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,10 +10,11 @@
# norootforbuild
+
Name: python-gammu
-BuildRequires: gammu-devel >= 1.14.90
+BuildRequires: gammu-devel >= 1.18.90
BuildRequires: python-devel
-Version: 0.24
+Version: 0.25
Release: 1
Requires: python-gammu python-wxGTK
AutoReqProv: on
@@ -50,26 +51,30 @@
%files -f INSTALLED_FILES
%defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS examples
+%doc AUTHORS COPYING README examples
%changelog
-* Tue Dec 18 2007 - prusnak@suse.cz
+* Tue Mar 11 2008 prusnak@suse.cz
+- updated to 0.25
+ * Compatibility with current gammu.
+ * Fixed Gammu version reported by python-gammu.
+* Tue Dec 18 2007 prusnak@suse.cz
- updated to 0.24
* Compatibility with current gammu.
* Improved MinGW crosscompilation instructions.
-* Thu Nov 08 2007 - prusnak@suse.cz
+* Thu Nov 08 2007 prusnak@suse.cz
- update to 0.23
* compatibility with current gammu
-* Tue Sep 25 2007 - prusnak@suse.cz
+* Tue Sep 25 2007 prusnak@suse.cz
- update to 0.22
* complete support for managing calls
* compatibility with current gammu
-* Tue Jun 19 2007 - prusnak@suse.cz
+* Tue Jun 19 2007 prusnak@suse.cz
- update to 0.21:
* Added suport for nick name in phonebook
* Added suport for work address in phonebook
* Converted to new Gammu API
-* Tue May 15 2007 - prusnak@suse.cz
+* Tue May 15 2007 prusnak@suse.cz
- update to 0.20:
* Fixed call information conversion
* Support for last modified field
@@ -81,25 +86,25 @@
* Main library is now gammu.Core, but gammu.* still works
* Support for service numbers
* New example for service numbers, see examples/service-numbers.py
-* Tue Feb 27 2007 - prusnak@suse.cz
+* Tue Feb 27 2007 prusnak@suse.cz
- update to 0.19
* fixed crash on wrongly configured locales
* added suport for SendFilePart
-* Wed Jan 03 2007 - prusnak@suse.cz
+* Wed Jan 03 2007 prusnak@suse.cz
- update to 0.17
* Support for python 2.5.
* Initial support for WAP bookmarks.
* Initial support for MMS indicators.
-* Thu Dec 14 2006 - prusnak@suse.cz
+* Thu Dec 14 2006 prusnak@suse.cz
- update to 0.16
* Support for recent gammu versions
-* Wed Oct 18 2006 - ro@suse.de
+* Wed Oct 18 2006 ro@suse.de
- make it even start
-* Tue Oct 17 2006 - ro@suse.de
+* Tue Oct 17 2006 ro@suse.de
- update to 0.15
* Support for recent gammu versions.
* Fix bug in SMS code.
-* Thu Jul 27 2006 - mjancar@suse.cz
+* Thu Jul 27 2006 mjancar@suse.cz
- update to 0.14
* Improved documentation.
* Fixed setup.py for win32.
@@ -113,21 +118,21 @@
* Improved build system.
* Added example for inserting backup (eg. vcard) to arbitrary memory.
* Added support for incoming events (with example showing usage).
-* Tue Feb 28 2006 - jmatejek@suse.cz
+* Tue Feb 28 2006 jmatejek@suse.cz
- updated to reflect python changes due to #149809
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Jan 12 2006 - mjancar@suse.cz
+* Thu Jan 12 2006 mjancar@suse.cz
- update to 0.10
-* Tue May 17 2005 - mcihar@suse.cz
+* Tue May 17 2005 mcihar@suse.cz
- update to 0.8
-* Mon Jan 24 2005 - mcihar@suse.cz
+* Mon Jan 24 2005 mcihar@suse.cz
- update to 0.7
-* Mon Sep 06 2004 - mcihar@suse.cz
+* Mon Sep 06 2004 mcihar@suse.cz
- update to 0.6
-* Thu Mar 04 2004 - mcihar@suse.cz
+* Thu Mar 04 2004 mcihar@suse.cz
- updated to 0.5
-* Fri Jan 23 2004 - mcihar@suse.cz
+* Fri Jan 23 2004 mcihar@suse.cz
- updated to 0.4
-* Mon Jan 05 2004 - mcihar@suse.cz
+* Mon Jan 05 2004 mcihar@suse.cz
- initial packaging
++++++ python-gammu-0.24.tar.bz2 -> python-gammu-0.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/ChangeLog new/python-gammu-0.25/ChangeLog
--- old/python-gammu-0.24/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/python-gammu-0.25/ChangeLog 2008-03-05 22:49:55.000000000 +0100
@@ -0,0 +1,164 @@
+NEWS
+====
+
+Major changes for each release are described here. Detailed changes between
+two versions can be retrieved from Subversion.
+
+0.25
+==== (2008-03-05)
+
+* Compatibility with current gammu.
+* Fixed Gammu version reported by python-gammu.
+
+0.24
+==== (2007-12-16)
+
+* Compatibility with current gammu.
+* Improved MinGW crosscompilation instructions.
+
+0.23
+==== (2007-11-08)
+
+* Compatibility with current gammu.
+
+0.22
+==== (2007-08-25)
+
+* Complete support for managing calls.
+* Compatibility with current gammu.
+
+0.21
+==== (2007-06-15)
+
+* Added suport for nick name in phonebook.
+* Added suport for work address in phonebook.
+* Converted to new Gammu API.
+
+0.20
+==== (2007-05-13)
+
+* Fixed call information conversion.
+* Support for last modified field.
+* Support for latest Gammu version.
+* Added python wrapper around C module, C module is now gammu.Core.
+* Moved some generic data from Wammu.
+* Added asynchronous wrapper around StateMachine.
+* Added example for async operations, see examples/worker.py.
+* Main library is now gammu.Core, but gammu.* still works.
+* Support for service numbers.
+* New example for service numbers, see examples/service-numbers.py.
+
+0.19
+==== (2007-02-23)
+
+* Fix crash on wrongly configured locales.
+* Added suport for SendFilePart.
+
+0.18
+==== (2007-02-07)
+
+* Cleaned up build system.
+* Support for crosscompilation using MinGW32.
+* Compatibility with current gammu releases and CMake build system.
+
+0.17
+==== (2006-12-18)
+
+* Support for python 2.5.
+* Initial support for WAP bookmarks.
+* Initial support for MMS indicators.
+
+0.16
+==== (2006-12-04)
+
+* Support for recent gammu versions.
+
+0.15
+==== (2006-09-20)
+
+* Support for recent gammu versions.
+* Fix bug in SMS code.
+
+0.14
+==== (2006-06-29)
+
+* Improved documentation.
+* Fixed setup.py for win32.
+
+0.13
+==== (2006-05-14)
+
+* Implemented adding of entries even when phone does not directly support
+ that.
+* Error messages are now also unicode objects as they might be translated by
+ gammu.
+* Properly handle locales in case other python module also uses them.
+* Added some examples.
+
+0.12
+==== (2006-03-24)
+
+* Added support for Siemens OTA new in gammu 1.05.00.
+* Improved build system.
+
+0.11
+==== (2006-02-24)
+
+* Added example for inserting backup (eg. vcard) to arbitrary memory.
+* Added support for incoming events (with example showing usage).
+
+0.10
+==== (2006-01-08)
+
+* Add Errors dictionary with name -> id mapping of errors.
+* Fix segfault in some corner situations.
+
+0.9
+=== (2005-12-24)
+
+* Added support for SMS backups.
+* Support for filesystem functions.
+* Full support for phonebook (SMSList and VoiceTags were ignored before).
+
+0.8
+=== (2005-05-17)
+
+* Compatibility with current gammu release.
+* Documented exceptions.
+* Added example for sending SMS.
+
+0.7
+=== (2005-01-23)
+
+* Compatibility with current gammu release.
+* Fail when using another gammu version than was used during compilation.
+* Better search for gammu (now should work with default shared installation).
+
+0.6
+=== (2004-09-06)
+
+* Library is now thread safe.
+
+0.5
+=== (2004-03-03)
+
+* Better handling of SMS validity.
+* Can make voice calls.
+
+0.4
+=== (2004-01-04)
+
+* SMS with some data are now converted to/from Pyyhon correctly.
+* Added work with SMS folders.
+* Added support for creating categories.
+* Ringtone parts of SMS are now also converted.
+* Can save ringtones.
+* Support for reading/writing backups.
+* Works much better in multi thread applications - releases Pythons global
+ lock for communication with phone.
+
+0.3
+=== (2003-12-27)
+
+* First widely announced release.
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/backup.c new/python-gammu-0.25/convertors/backup.c
--- old/python-gammu-0.24/convertors/backup.c 2007-10-18 10:20:25.000000000 +0200
+++ new/python-gammu-0.25/convertors/backup.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/base.c new/python-gammu-0.25/convertors/base.c
--- old/python-gammu-0.24/convertors/base.c 2007-06-26 11:54:22.000000000 +0200
+++ new/python-gammu-0.25/convertors/base.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/bitmap.c new/python-gammu-0.25/convertors/bitmap.c
--- old/python-gammu-0.24/convertors/bitmap.c 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.25/convertors/bitmap.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/calendar.c new/python-gammu-0.25/convertors/calendar.c
--- old/python-gammu-0.24/convertors/calendar.c 2007-04-24 20:52:36.000000000 +0200
+++ new/python-gammu-0.25/convertors/calendar.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/call.c new/python-gammu-0.25/convertors/call.c
--- old/python-gammu-0.24/convertors/call.c 2007-04-10 20:42:39.000000000 +0200
+++ new/python-gammu-0.25/convertors/call.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/file.c new/python-gammu-0.25/convertors/file.c
--- old/python-gammu-0.24/convertors/file.c 2007-06-26 11:48:37.000000000 +0200
+++ new/python-gammu-0.25/convertors/file.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/memory.c new/python-gammu-0.25/convertors/memory.c
--- old/python-gammu-0.24/convertors/memory.c 2007-08-06 06:43:15.000000000 +0200
+++ new/python-gammu-0.25/convertors/memory.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/misc.c new/python-gammu-0.25/convertors/misc.c
--- old/python-gammu-0.24/convertors/misc.c 2007-05-11 10:57:51.000000000 +0200
+++ new/python-gammu-0.25/convertors/misc.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/ringtone.c new/python-gammu-0.25/convertors/ringtone.c
--- old/python-gammu-0.24/convertors/ringtone.c 2007-05-29 14:35:55.000000000 +0200
+++ new/python-gammu-0.25/convertors/ringtone.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/sms.c new/python-gammu-0.25/convertors/sms.c
--- old/python-gammu-0.24/convertors/sms.c 2007-10-31 07:55:24.000000000 +0100
+++ new/python-gammu-0.25/convertors/sms.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/string.c new/python-gammu-0.25/convertors/string.c
--- old/python-gammu-0.24/convertors/string.c 2007-06-11 12:15:01.000000000 +0200
+++ new/python-gammu-0.25/convertors/string.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/time.c new/python-gammu-0.25/convertors/time.c
--- old/python-gammu-0.24/convertors/time.c 2007-01-06 13:24:11.000000000 +0100
+++ new/python-gammu-0.25/convertors/time.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/todo.c new/python-gammu-0.25/convertors/todo.c
--- old/python-gammu-0.24/convertors/todo.c 2007-04-24 20:52:36.000000000 +0200
+++ new/python-gammu-0.25/convertors/todo.c 2008-02-25 10:46:22.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
@@ -83,6 +83,15 @@
f = Py_BuildValue("{s:s,s:O}", "Type", "END_DATETIME", "Value", d);
Py_DECREF(d);
break;
+ case TODO_START_DATETIME:
+ d = BuildPythonDateTime(&(entry->Entries[i].Date));
+ if (d == NULL) {
+ Py_DECREF(v);
+ return NULL;
+ }
+ f = Py_BuildValue("{s:s,s:O}", "Type", "START_DATETIME", "Value", d);
+ Py_DECREF(d);
+ break;
case TODO_ALARM_DATETIME:
d = BuildPythonDateTime(&(entry->Entries[i].Date));
if (d == NULL) {
@@ -276,6 +285,9 @@
if (strcmp("END_DATETIME", type) == 0) {
valuetype = 'd';
entry->Entries[i].EntryType = TODO_END_DATETIME;
+ } else if (strcmp("START_DATETIME", type) == 0) {
+ valuetype = 'd';
+ entry->Entries[i].EntryType = TODO_START_DATETIME;
} else if (strcmp("COMPLETED", type) == 0) {
valuetype = 'n';
entry->Entries[i].EntryType = TODO_COMPLETED;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors/wap.c new/python-gammu-0.25/convertors/wap.c
--- old/python-gammu-0.24/convertors/wap.c 2007-01-01 16:07:32.000000000 +0100
+++ new/python-gammu-0.25/convertors/wap.c 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/convertors.h new/python-gammu-0.25/convertors.h
--- old/python-gammu-0.24/convertors.h 2007-10-31 07:55:24.000000000 +0100
+++ new/python-gammu-0.25/convertors.h 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/errors.c new/python-gammu-0.25/errors.c
--- old/python-gammu-0.24/errors.c 2007-11-14 03:16:51.000000000 +0100
+++ new/python-gammu-0.25/errors.c 2008-02-29 09:56:49.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
@@ -23,66 +23,8 @@
#include "convertors.h"
PyObject *GammuError;
-PyObject *PyERR_DEVICEOPENERROR;
-PyObject *PyERR_DEVICELOCKED;
-PyObject *PyERR_DEVICENOTEXIST;
-PyObject *PyERR_DEVICEBUSY;
-PyObject *PyERR_DEVICENOPERMISSION;
-PyObject *PyERR_DEVICENODRIVER;
-PyObject *PyERR_DEVICENOTWORK;
-PyObject *PyERR_DEVICEDTRRTSERROR;
-PyObject *PyERR_DEVICECHANGESPEEDERROR;
-PyObject *PyERR_DEVICEWRITEERROR;
-PyObject *PyERR_DEVICEREADERROR;
-PyObject *PyERR_DEVICEPARITYERROR;
-PyObject *PyERR_TIMEOUT;
-PyObject *PyERR_FRAMENOTREQUESTED;
-PyObject *PyERR_UNKNOWNRESPONSE;
-PyObject *PyERR_UNKNOWNFRAME;
-PyObject *PyERR_UNKNOWNCONNECTIONTYPESTRING;
-PyObject *PyERR_UNKNOWNMODELSTRING;
-PyObject *PyERR_SOURCENOTAVAILABLE;
-PyObject *PyERR_NOTSUPPORTED;
-PyObject *PyERR_EMPTY;
-PyObject *PyERR_SECURITYERROR;
-PyObject *PyERR_INVALIDLOCATION;
-PyObject *PyERR_NOTIMPLEMENTED;
-PyObject *PyERR_FULL;
-PyObject *PyERR_UNKNOWN;
-PyObject *PyERR_CANTOPENFILE;
-PyObject *PyERR_MOREMEMORY;
-PyObject *PyERR_PERMISSION;
-PyObject *PyERR_EMPTYSMSC;
-PyObject *PyERR_INSIDEPHONEMENU;
-PyObject *PyERR_NOTCONNECTED;
-PyObject *PyERR_WORKINPROGRESS;
-PyObject *PyERR_PHONEOFF;
-PyObject *PyERR_FILENOTSUPPORTED;
-PyObject *PyERR_BUG;
-PyObject *PyERR_CANCELED;
-PyObject *PyERR_NEEDANOTHERANSWER;
-PyObject *PyERR_OTHERCONNECTIONREQUIRED;
-PyObject *PyERR_WRONGCRC;
-PyObject *PyERR_INVALIDDATETIME;
-PyObject *PyERR_MEMORY;
-PyObject *PyERR_INVALIDDATA;
-PyObject *PyERR_FILEALREADYEXIST;
-PyObject *PyERR_FILENOTEXIST;
-PyObject *PyERR_SHOULDBEFOLDER;
-PyObject *PyERR_SHOULDBEFILE;
-PyObject *PyERR_NOSIM;
-PyObject *PyERR_GNAPPLETWRONG;
-PyObject *PyERR_FOLDERPART;
-PyObject *PyERR_FOLDERNOTEMPTY;
-PyObject *PyERR_DATACONVERTED;
-PyObject *PyERR_UNCONFIGURED;
-PyObject *PyERR_WRONGFOLDER;
-PyObject *PyERR_PHONE_INTERNAL;
-PyObject *PyERR_WRITING_FILE;
-PyObject *PyERR_NONE_SECTION;
-PyObject *PyERR_USING_DEFAULTS;
-PyObject *PyERR_CORRUPTED;
-PyObject *PyERR_LAST_VALUE;
+
+PyObject **gammu_error_map;
int checkError(GSM_StateMachine *s, GSM_Error error, char *where) {
PyObject *val;
@@ -90,69 +32,10 @@
PyObject *err = GammuError;
const char *msg;
- switch (error) {
- case ERR_NONE: return 1;
- case ERR_DEVICEOPENERROR: err = PyERR_DEVICEOPENERROR; break;
- case ERR_DEVICELOCKED: err = PyERR_DEVICELOCKED; break;
- case ERR_DEVICENOTEXIST: err = PyERR_DEVICENOTEXIST; break;
- case ERR_DEVICEBUSY: err = PyERR_DEVICEBUSY; break;
- case ERR_DEVICENOPERMISSION: err = PyERR_DEVICENOPERMISSION; break;
- case ERR_DEVICENODRIVER: err = PyERR_DEVICENODRIVER; break;
- case ERR_DEVICENOTWORK: err = PyERR_DEVICENOTWORK; break;
- case ERR_DEVICEDTRRTSERROR: err = PyERR_DEVICEDTRRTSERROR; break;
- case ERR_DEVICECHANGESPEEDERROR: err = PyERR_DEVICECHANGESPEEDERROR; break;
- case ERR_DEVICEWRITEERROR: err = PyERR_DEVICEWRITEERROR; break;
- case ERR_DEVICEREADERROR: err = PyERR_DEVICEREADERROR; break;
- case ERR_DEVICEPARITYERROR: err = PyERR_DEVICEPARITYERROR; break;
- case ERR_TIMEOUT: err = PyERR_TIMEOUT; break;
- case ERR_FRAMENOTREQUESTED: err = PyERR_FRAMENOTREQUESTED; break;
- case ERR_UNKNOWNRESPONSE: err = PyERR_UNKNOWNRESPONSE; break;
- case ERR_UNKNOWNFRAME: err = PyERR_UNKNOWNFRAME; break;
- case ERR_UNKNOWNCONNECTIONTYPESTRING: err = PyERR_UNKNOWNCONNECTIONTYPESTRING; break;
- case ERR_UNKNOWNMODELSTRING: err = PyERR_UNKNOWNMODELSTRING; break;
- case ERR_SOURCENOTAVAILABLE: err = PyERR_SOURCENOTAVAILABLE; break;
- case ERR_NOTSUPPORTED: err = PyERR_NOTSUPPORTED; break;
- case ERR_EMPTY: err = PyERR_EMPTY; break;
- case ERR_SECURITYERROR: err = PyERR_SECURITYERROR; break;
- case ERR_INVALIDLOCATION: err = PyERR_INVALIDLOCATION; break;
- case ERR_NOTIMPLEMENTED: err = PyERR_NOTIMPLEMENTED; break;
- case ERR_FULL: err = PyERR_FULL; break;
- case ERR_UNKNOWN: err = PyERR_UNKNOWN; break;
- case ERR_CANTOPENFILE: err = PyERR_CANTOPENFILE; break;
- case ERR_MOREMEMORY: err = PyERR_MOREMEMORY; break;
- case ERR_PERMISSION: err = PyERR_PERMISSION; break;
- case ERR_EMPTYSMSC: err = PyERR_EMPTYSMSC; break;
- case ERR_INSIDEPHONEMENU: err = PyERR_INSIDEPHONEMENU; break;
- case ERR_NOTCONNECTED: err = PyERR_NOTCONNECTED; break;
- case ERR_WORKINPROGRESS: err = PyERR_WORKINPROGRESS; break;
- case ERR_PHONEOFF: err = PyERR_PHONEOFF; break;
- case ERR_FILENOTSUPPORTED: err = PyERR_FILENOTSUPPORTED; break;
- case ERR_BUG: err = PyERR_BUG; break;
- case ERR_CANCELED: err = PyERR_CANCELED; break;
- case ERR_NEEDANOTHERANSWER: err = PyERR_NEEDANOTHERANSWER; break;
- case ERR_OTHERCONNECTIONREQUIRED: err = PyERR_OTHERCONNECTIONREQUIRED; break;
- case ERR_WRONGCRC: err = PyERR_WRONGCRC; break;
- case ERR_INVALIDDATETIME: err = PyERR_INVALIDDATETIME; break;
- case ERR_MEMORY: err = PyERR_MEMORY; break;
- case ERR_INVALIDDATA: err = PyERR_INVALIDDATA; break;
- case ERR_FILEALREADYEXIST: err = PyERR_FILEALREADYEXIST; break;
- case ERR_FILENOTEXIST: err = PyERR_FILENOTEXIST; break;
- case ERR_SHOULDBEFOLDER: err = PyERR_SHOULDBEFOLDER; break;
- case ERR_SHOULDBEFILE: err = PyERR_SHOULDBEFILE; break;
- case ERR_NOSIM: err = PyERR_NOSIM; break;
- case ERR_GNAPPLETWRONG: err = PyERR_GNAPPLETWRONG; break;
- case ERR_FOLDERPART: err = PyERR_FOLDERPART; break;
- case ERR_FOLDERNOTEMPTY: err = PyERR_FOLDERNOTEMPTY; break;
- case ERR_DATACONVERTED: err = PyERR_DATACONVERTED; break;
- case ERR_UNCONFIGURED: err = PyERR_UNCONFIGURED; break;
- case ERR_WRONGFOLDER: err = PyERR_WRONGFOLDER; break;
- case ERR_PHONE_INTERNAL: err = PyERR_PHONE_INTERNAL; break;
- case ERR_WRITING_FILE: err = PyERR_WRITING_FILE; break;
- case ERR_NONE_SECTION: err = PyERR_NONE_SECTION; break;
- case ERR_USING_DEFAULTS: err = PyERR_USING_DEFAULTS; break;
- case ERR_CORRUPTED: err = PyERR_CORRUPTED; break;
- case ERR_LAST_VALUE: err = PyERR_LAST_VALUE; break;
- }
+ if (error == ERR_NONE) return 1;
+
+ if (error < ERR_LAST_VALUE && error >= ERR_NONE)
+ err = gammu_error_map[error];
msg = GSM_ErrorString(error);
@@ -177,39 +60,19 @@
return 0;
}
-#define CREATE_ERROR(x) \
- /* Help text */ \
- help_text = PyString_FromFormat("Exception corresponding to gammu error " #x ".\nVerbose error description: %s", GSM_ErrorString(x)); \
- if (help_text == NULL) \
- return 0; \
- error_dict = PyDict_New(); \
- if (error_dict == NULL) \
- return 0; \
- PyDict_SetItemString(error_dict, "__doc__", help_text); \
- Py_DECREF(help_text); \
- /* Create exception */ \
- Py##x = PyErr_NewException("gammu." #x, GammuError, error_dict);\
- Py_DECREF(error_dict); \
- if (Py##x == NULL)\
- return 0;\
- PyDict_SetItemString(d, "" #x, Py##x); \
- Py_DECREF(Py##x); \
- /* Store ids in dict */ \
- id = PyInt_FromLong(x); \
- if (id == NULL)\
- return 0;\
- PyDict_SetItemString(error_list, "" #x, id); \
- PyDict_SetItem(errornumber_list, id, PyString_FromString("" #x)); \
- Py_DECREF(id); \
- /* End of macro */
-
-
int gammu_create_errors(PyObject *d) {
PyObject *help_text;
PyObject *error_dict;
PyObject *error_list;
PyObject *errornumber_list;
PyObject *id;
+ GSM_Error error;
+ char errname[100];
+
+ /* Prepare error code -> python objects mapping */
+ gammu_error_map = (PyObject **)malloc(sizeof(PyObject *) * ((int)ERR_LAST_VALUE + 1));
+ if (gammu_error_map == NULL)
+ return 0;
/* Prepare dict for error codes */
error_list = PyDict_New();
@@ -237,67 +100,54 @@
PyDict_SetItemString(d, "GSMError", GammuError);
Py_DECREF(GammuError);
- CREATE_ERROR(ERR_DEVICEOPENERROR)
- CREATE_ERROR(ERR_DEVICELOCKED)
- CREATE_ERROR(ERR_DEVICENOTEXIST)
- CREATE_ERROR(ERR_DEVICEBUSY)
- CREATE_ERROR(ERR_DEVICENOPERMISSION)
- CREATE_ERROR(ERR_DEVICENODRIVER)
- CREATE_ERROR(ERR_DEVICENOTWORK)
- CREATE_ERROR(ERR_DEVICEDTRRTSERROR)
- CREATE_ERROR(ERR_DEVICECHANGESPEEDERROR)
- CREATE_ERROR(ERR_DEVICEWRITEERROR)
- CREATE_ERROR(ERR_DEVICEREADERROR)
- CREATE_ERROR(ERR_DEVICEPARITYERROR)
- CREATE_ERROR(ERR_TIMEOUT)
- CREATE_ERROR(ERR_FRAMENOTREQUESTED)
- CREATE_ERROR(ERR_UNKNOWNRESPONSE)
- CREATE_ERROR(ERR_UNKNOWNFRAME)
- CREATE_ERROR(ERR_UNKNOWNCONNECTIONTYPESTRING)
- CREATE_ERROR(ERR_UNKNOWNMODELSTRING)
- CREATE_ERROR(ERR_SOURCENOTAVAILABLE)
- CREATE_ERROR(ERR_NOTSUPPORTED)
- CREATE_ERROR(ERR_EMPTY)
- CREATE_ERROR(ERR_SECURITYERROR)
- CREATE_ERROR(ERR_INVALIDLOCATION)
- CREATE_ERROR(ERR_NOTIMPLEMENTED)
- CREATE_ERROR(ERR_FULL)
- CREATE_ERROR(ERR_UNKNOWN)
- CREATE_ERROR(ERR_CANTOPENFILE)
- CREATE_ERROR(ERR_MOREMEMORY)
- CREATE_ERROR(ERR_PERMISSION)
- CREATE_ERROR(ERR_EMPTYSMSC)
- CREATE_ERROR(ERR_INSIDEPHONEMENU)
- CREATE_ERROR(ERR_NOTCONNECTED)
- CREATE_ERROR(ERR_WORKINPROGRESS)
- CREATE_ERROR(ERR_PHONEOFF)
- CREATE_ERROR(ERR_FILENOTSUPPORTED)
- CREATE_ERROR(ERR_BUG)
- CREATE_ERROR(ERR_CANCELED)
- CREATE_ERROR(ERR_NEEDANOTHERANSWER)
- CREATE_ERROR(ERR_OTHERCONNECTIONREQUIRED)
- CREATE_ERROR(ERR_WRONGCRC)
- CREATE_ERROR(ERR_INVALIDDATETIME)
- CREATE_ERROR(ERR_MEMORY)
- CREATE_ERROR(ERR_INVALIDDATA)
- CREATE_ERROR(ERR_FILEALREADYEXIST)
- CREATE_ERROR(ERR_FILENOTEXIST)
- CREATE_ERROR(ERR_SHOULDBEFOLDER)
- CREATE_ERROR(ERR_SHOULDBEFILE)
- CREATE_ERROR(ERR_NOSIM)
- CREATE_ERROR(ERR_GNAPPLETWRONG)
- CREATE_ERROR(ERR_FOLDERPART)
- CREATE_ERROR(ERR_FOLDERNOTEMPTY)
- CREATE_ERROR(ERR_DATACONVERTED)
- CREATE_ERROR(ERR_UNCONFIGURED)
- CREATE_ERROR(ERR_WRONGFOLDER)
- CREATE_ERROR(ERR_PHONE_INTERNAL)
- CREATE_ERROR(ERR_WRITING_FILE)
- CREATE_ERROR(ERR_NONE_SECTION)
- CREATE_ERROR(ERR_USING_DEFAULTS)
- CREATE_ERROR(ERR_CORRUPTED)
- CREATE_ERROR(ERR_LAST_VALUE)
+ /* Create exception objects and mappings */
+ for (error = ERR_NONE; error < ERR_LAST_VALUE; error++) {
+
+ /* Do we know name of this exception? */
+ if (GSM_ErrorName(error) == NULL) {
+ pyg_error("failed to convert error code %d to string!\n", error);
+ continue;
+ }
+
+ /* Help text */
+ help_text = PyString_FromFormat("Exception corresponding to gammu error ERR_%s.\n"
+ "Verbose error description: %s",
+ GSM_ErrorName(error),
+ GSM_ErrorString(error));
+ if (help_text == NULL)
+ return 0;
+
+ /* Exception dictionary (contains only help for now) */
+ error_dict = PyDict_New();
+ if (error_dict == NULL)
+ return 0;
+ PyDict_SetItemString(error_dict, "__doc__", help_text);
+ Py_DECREF(help_text);
+
+ /* Create exception */
+ strcpy(errname, "gammu.ERR_");
+ strcat(errname, GSM_ErrorName(error));
+ gammu_error_map[error] = PyErr_NewException(errname, GammuError, error_dict);
+ Py_DECREF(error_dict);
+ if (gammu_error_map[error] == NULL)
+ return 0;
+
+ /* Add it to module dictionary */
+ strcpy(errname, "ERR_");
+ strcat(errname, GSM_ErrorName(error));
+ PyDict_SetItemString(d, errname, gammu_error_map[error]);
+ Py_DECREF(gammu_error_map[error]);
+
+ /* Store ids in dictionary */
+ id = PyInt_FromLong(error);
+ if (id == NULL)
+ return 0;
+ PyDict_SetItemString(error_list, errname, id);
+ PyDict_SetItem(errornumber_list, id, PyString_FromString(errname));
+ Py_DECREF(id);
+ }
+ /* Add ID dictionaries to module */
PyDict_SetItemString(d, "Errors", error_list);
Py_DECREF(error_list);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/errors.h new/python-gammu-0.25/errors.h
--- old/python-gammu-0.24/errors.h 2007-07-16 15:49:30.000000000 +0200
+++ new/python-gammu-0.25/errors.h 2008-01-06 06:02:47.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/examples/service-numbers.py new/python-gammu-0.25/examples/service-numbers.py
--- old/python-gammu-0.24/examples/service-numbers.py 2007-05-11 11:10:16.000000000 +0200
+++ new/python-gammu-0.25/examples/service-numbers.py 2008-01-06 06:02:47.000000000 +0100
@@ -7,7 +7,7 @@
__author__ = 'Michal Čihař'
__email__ = 'michal@cihar.com'
__license__ = '''
-Copyright (c) 2003 - 2007 Michal Čihař
+Copyright © 2003 - 2008 Michal Čihař
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published by
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/examples/worker.py new/python-gammu-0.25/examples/worker.py
--- old/python-gammu-0.24/examples/worker.py 2007-08-01 15:11:15.000000000 +0200
+++ new/python-gammu-0.25/examples/worker.py 2008-01-06 06:02:47.000000000 +0100
@@ -11,7 +11,7 @@
__author__ = 'Michal Čihař'
__email__ = 'michal@cihar.com'
__license__ = '''
-Copyright (c) 2003 - 2007 Michal Čihař
+Copyright © 2003 - 2008 Michal Čihař
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published by
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/gammu/Data.py new/python-gammu-0.25/gammu/Data.py
--- old/python-gammu-0.24/gammu/Data.py 2007-11-14 03:15:10.000000000 +0100
+++ new/python-gammu-0.25/gammu/Data.py 2008-02-06 05:56:02.000000000 +0100
@@ -14,7 +14,7 @@
__author__ = 'Michal Čihař'
__email__ = 'michal@cihar.com'
__license__ = '''
-Copyright (c) 2003 - 2007 Michal Čihař
+Copyright © 2003 - 2008 Michal Čihař
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published by
@@ -49,6 +49,7 @@
'irdaobex',
'irdagnapbus',
'bluerffbus',
+ 'bluefbus',
'bluerfphonet',
'bluephonet',
'blueat',
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/gammu/__init__.py new/python-gammu-0.25/gammu/__init__.py
--- old/python-gammu-0.24/gammu/__init__.py 2007-07-16 15:44:34.000000000 +0200
+++ new/python-gammu-0.25/gammu/__init__.py 2008-01-08 05:04:25.000000000 +0100
@@ -3,15 +3,15 @@
'''
Phone communication libary - python wrapper for Gammu library.
-This module wraps all python-gammu functionality. Core library is
-named L{gammu.Core} and all of it's content is automatically
+This module wraps all python-gammu functionality. Core library is
+named L{gammu.Core} and all of it's content is automatically
imported also into this gammu module, so you can use both
L{gammu.StateMachine} or L{gammu.Core.StateMachine}.
'''
__author__ = 'Michal Čihař'
__email__ = 'michal@cihar.com'
__license__ = '''
-Copyright (c) 2003 - 2007 Michal Čihař
+Copyright © 2003 - 2008 Michal Čihař
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published by
@@ -38,4 +38,7 @@
from gammu.Core import *
import gammu.Core
-__version__ = 'Gammu %s, python-gammu %s' % gammu.Core.Version()
+__version__ = 'Gammu %s, python-gammu %s' % (
+ gammu.Core.Version()[0],
+ gammu.Core.Version()[1]
+ )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/gammu/Worker.py new/python-gammu-0.25/gammu/Worker.py
--- old/python-gammu-0.24/gammu/Worker.py 2007-08-01 16:09:52.000000000 +0200
+++ new/python-gammu-0.25/gammu/Worker.py 2008-01-06 06:02:47.000000000 +0100
@@ -9,7 +9,7 @@
__author__ = 'Michal Čihař'
__email__ = 'michal@cihar.com'
__license__ = '''
-Copyright (c) 2003 - 2007 Michal Čihař
+Copyright © 2003 - 2008 Michal Čihař
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published by
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/gammu.c new/python-gammu-0.25/gammu.c
--- old/python-gammu-0.24/gammu.c 2007-11-08 05:05:59.000000000 +0100
+++ new/python-gammu-0.25/gammu.c 2008-02-06 09:26:52.000000000 +0100
@@ -1,6 +1,6 @@
/*
* python-gammu - Phone communication libary
- * Copyright (c) 2003 - 2007 Michal Čihař
+ * Copyright © 2003 - 2008 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 the Free
@@ -741,10 +741,12 @@
GSM_Error error;
/* Disable any possible incoming notifications */
+ BEGIN_PHONE_COMM
GSM_SetIncomingSMS(self->s, false);
GSM_SetIncomingCall(self->s, false);
GSM_SetIncomingCB(self->s, false);
GSM_SetIncomingUSSD(self->s, false);
+ END_PHONE_COMM
/* Remove callbacks */
GSM_SetIncomingCallCallback(self->s, NULL);
@@ -5449,14 +5451,14 @@
static char gammu_Version__doc__[] =
"Version()\n\n"
"Get version information.\n"
-"@return: Tuple of python-gammu and Gammu versions.\n"
+"@return: Tuple of version information - Gammu runtime version, python-gammu version, build time Gammu version.\n"
"@rtype: tuple\n"
;
static PyObject *
gammu_Version(PyObject *self)
{
- return Py_BuildValue("s,s", VERSION, PYTHON_GAMMU_VERSION);
+ return Py_BuildValue("s,s,s", GetGammuVersion(), PYTHON_GAMMU_VERSION, VERSION);
}
static char gammu_SetDebugFile__doc__[] =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/python-gammu-0.24/MakeFakeWin.sh new/python-gammu-0.25/MakeFakeWin.sh
--- old/python-gammu-0.24/MakeFakeWin.sh 2007-11-30 08:08:14.000000000 +0100
+++ new/python-gammu-0.25/MakeFakeWin.sh 2007-12-19 07:10:12.000000000 +0100
@@ -1,90 +1,12 @@
#!/bin/bash
-cat > wine_linux_launcher.c <