Changeset: 123c52e50e1c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=123c52e50e1c
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (32 lines):
diff -r cbe1e2600e04 -r 123c52e50e1c python/monetdb/mapi2.py
--- a/python/monetdb/mapi2.py Tue Sep 21 16:45:58 2010 +0200
+++ b/python/monetdb/mapi2.py Wed Sep 22 09:47:59 2010 +0200
@@ -31,9 +31,9 @@
from monetdb.monetdb_exceptions import *
-# windows doesn't support MSG_WAITALL flag for recv
-flags = None
-if platform.system() != 'Windows':
+# Windows doesn't support MSG_WAITALL flag for recv
+flags = 0
+if hasattr(socket, 'MSG_WAITALL'):
flags = socket.MSG_WAITALL
logger = logging.getLogger("monetdb")
diff -r cbe1e2600e04 -r 123c52e50e1c python/monetdb/mapi3.py
--- a/python/monetdb/mapi3.py Tue Sep 21 16:45:58 2010 +0200
+++ b/python/monetdb/mapi3.py Wed Sep 22 09:47:59 2010 +0200
@@ -31,9 +31,9 @@
from monetdb.monetdb_exceptions import *
-# windows doesn't support MSG_WAITALL flag for recv
-flags = None
-if platform.system() != 'Windows':
+# Windows doesn't support MSG_WAITALL flag for recv
+flags = 0
+if hasattr(socket, 'MSG_WAITALL'):
flags = socket.MSG_WAITALL
logger = logging.getLogger("monetdb")
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
