Changeset: 70bbc1306bde for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=70bbc1306bde
Modified Files:
clients/python2/monetdb/control.py
clients/python2/monetdb/sql/connections.py
clients/python3/monetdb/control.py
clients/python3/monetdb/sql/connections.py
Branch: default
Log Message:
make localhost inet default for windows
diffs (92 lines):
diff --git a/clients/python2/monetdb/control.py
b/clients/python2/monetdb/control.py
--- a/clients/python2/monetdb/control.py
+++ b/clients/python2/monetdb/control.py
@@ -1,4 +1,4 @@
-
+import platform
from monetdb import mapi
from monetdb.exceptions import OperationalError, InterfaceError
@@ -68,11 +68,14 @@ class Control:
if not unix_socket:
unix_socket = "/tmp/.s.merovingian.%i" % port
+ if platform.system() == "Windows" and not hostname:
+ hostname = "localhost"
+
self.server = mapi.Connection()
self.hostname = hostname
self.port = port
self.passphrase = passphrase
- self.unix_socket= unix_socket
+ self.unix_socket = unix_socket
# check connection
self.server.connect(hostname=hostname, port=port, username='monetdb',
diff --git a/clients/python2/monetdb/sql/connections.py
b/clients/python2/monetdb/sql/connections.py
--- a/clients/python2/monetdb/sql/connections.py
+++ b/clients/python2/monetdb/sql/connections.py
@@ -16,6 +16,7 @@
# All Rights Reserved.
import logging
+import platform
from monetdb.sql import cursors
from monetdb import exceptions
@@ -52,6 +53,9 @@ class Connection(object):
if user:
username = user
+ if platform.system() == "Windows" and not hostname:
+ hostname = "localhost"
+
self.mapi = mapi.Connection()
self.mapi.connect(hostname=hostname, port=int(port), username=username,
password=password, database=database, language="sql",
diff --git a/clients/python3/monetdb/control.py
b/clients/python3/monetdb/control.py
--- a/clients/python3/monetdb/control.py
+++ b/clients/python3/monetdb/control.py
@@ -1,4 +1,4 @@
-
+import platform
from monetdb import mapi
from monetdb.exceptions import OperationalError, InterfaceError
@@ -68,11 +68,14 @@ class Control:
if not unix_socket:
unix_socket = "/tmp/.s.merovingian.%i" % port
+ if platform.system() == "Windows" and not hostname:
+ hostname = "localhost"
+
self.server = mapi.Connection()
self.hostname = hostname
self.port = port
self.passphrase = passphrase
- self.unix_socket= unix_socket
+ self.unix_socket = unix_socket
# check connection
self.server.connect(hostname=hostname, port=port, username='monetdb',
diff --git a/clients/python3/monetdb/sql/connections.py
b/clients/python3/monetdb/sql/connections.py
--- a/clients/python3/monetdb/sql/connections.py
+++ b/clients/python3/monetdb/sql/connections.py
@@ -16,6 +16,7 @@
# All Rights Reserved.
import logging
+import platform
from monetdb.sql import cursors
from monetdb import exceptions
@@ -52,6 +53,9 @@ class Connection(object):
if user:
username = user
+ if platform.system() == "Windows" and not hostname:
+ hostname = "localhost"
+
self.mapi = mapi.Connection()
self.mapi.connect(hostname=hostname, port=int(port), username=username,
password=password, database=database, language="sql",
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
