Changeset: eaa388565853 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eaa388565853
Modified Files:
Branch: Oct2010
Log Message:
merging
diffs (41 lines):
diff -r 1a8d83cae2c4 -r eaa388565853 python/monetdb/mapi2.py
--- a/python/monetdb/mapi2.py Wed Sep 22 12:43:16 2010 +0200
+++ b/python/monetdb/mapi2.py Wed Sep 22 12:45:23 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 1a8d83cae2c4 -r eaa388565853 python/monetdb/mapi3.py
--- a/python/monetdb/mapi3.py Wed Sep 22 12:43:16 2010 +0200
+++ b/python/monetdb/mapi3.py Wed Sep 22 12:45:23 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 1a8d83cae2c4 -r eaa388565853
sql/src/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
--- a/sql/src/test/mapi/Tests/python_test_monetdb_sql.SQL.bat Wed Sep 22
12:43:16 2010 +0200
+++ b/sql/src/test/mapi/Tests/python_test_monetdb_sql.SQL.bat Wed Sep 22
12:45:23 2010 +0200
@@ -10,4 +10,4 @@
prompt # $t $g
echo on
-python %testpath%/runtests.py
+python "%testpath%/runtests.py"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
