[Firebird-checkins] SF.net SVN: firebird:[54570] python/fdb/trunk/fdb/fbcore.py

[<mak...@us...>]

Revision: 54570
          http://firebird.svn.sourceforge.net/firebird/?rev=54570&view=rev
Author:   makowski
Date:     2012-05-30 14:09:37 +0000 (Wed, 30 May 2012)
Log Message:
-----------
changes in events for P3K

Modified Paths:
--------------
    python/fdb/trunk/fdb/fbcore.py

Modified: python/fdb/trunk/fdb/fbcore.py
===================================================================
--- python/fdb/trunk/fdb/fbcore.py	2012-05-30 03:35:30 UTC (rev 54569)
+++ python/fdb/trunk/fdb/fbcore.py	2012-05-30 14:09:37 UTC (rev 54570)
@@ -31,7 +31,12 @@
 import decimal
 import weakref
 import threading
-from itertools import izip_longest
+try:
+    # Python 2
+    from itertools import izip_longest
+except ImportError:
+    # Python 3
+    from itertools import zip_longest as izip_longest
 from fdb.ibase import (frb_info_att_charset, isc_dpb_activate_shadow,
     isc_dpb_address_path, isc_dpb_allocation, isc_dpb_begin_log,
     isc_dpb_buffer_length, isc_dpb_cache_manager, isc_dpb_cdd_pathname,
@@ -1140,7 +1145,7 @@
 
         self.buf_length = ibase.isc_event_block(ctypes.pointer(self.event_buf),
                                                   ctypes.pointer(self.result_buf),
-                                                  *event_names)
+                                                  *[b(x) for x in event_names])
         self.__wait_for_events()
     def __wait_for_events(self):
         ibase.isc_que_events(self._isc_status,self._db_handle,self.event_id,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.