|
From: <sub...@co...> - 2005-10-03 10:07:46
|
Author: phd
Date: 2005-10-03 10:07:29 +0000 (Mon, 03 Oct 2005)
New Revision: 1072
Modified:
SQLObject/trunk/docs/SQLObject.txt
SQLObject/trunk/docs/europython/europython_sqlobj.py
SQLObject/trunk/docs/europython/person.py
SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
SQLObject/trunk/sqlobject/postgres/pgconnection.py
SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
SQLObject/trunk/sqlobject/tests/test_parse.py
Log:
Changed "passwd" to "password".
Modified: SQLObject/trunk/docs/SQLObject.txt
===================================================================
--- SQLObject/trunk/docs/SQLObject.txt 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/docs/SQLObject.txt 2005-10-03 10:07:29 UTC (rev 1072)
@@ -139,7 +139,7 @@
Examples::
- mysql://user:passwd@host/database
+ mysql://user:password@host/database
mysql://host/database?debug=1
postgres://user@host/database?debug=&cache=
postgres://host:5432/database
@@ -1409,7 +1409,7 @@
-----
`MySQLConnection` takes the keyword arguments `host`, `port`, `db`, `user`,
-and `passwd`, just like `MySQLdb.connect` does.
+and `password`, just like `MySQLdb.connect` does.
MySQLConnection supports all the features, though MySQL only supports
transactions_ when using the InnoDB backend, and SQLObject currently
@@ -1447,7 +1447,7 @@
--------
`FirebirdConnection` takes the arguments `host`, `db`, `user` (default
-``"sysdba"``), `passwd` (default ``"masterkey"``).
+``"sysdba"``), `password` (default ``"masterkey"``).
Firebird supports all the features. Support is still young, so there
may be some issues, especially with concurrent access, and especially
@@ -1469,7 +1469,7 @@
----------------
`SybaseConnection` takes the arguments `host`, `db`, `user`, and
-`passwd`. It also takes the extra boolean argument `locking` (default
+`password`. It also takes the extra boolean argument `locking` (default
True), which is passed through when performing a connection. You may
use a False value for `locking` if you are not using multiple threads,
for a slight performance boost.
Modified: SQLObject/trunk/docs/europython/europython_sqlobj.py
===================================================================
--- SQLObject/trunk/docs/europython/europython_sqlobj.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/docs/europython/europython_sqlobj.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -43,7 +43,7 @@
PRE("""\
from SQLObject import *
-conn = PostgresConnection(db = 'testdb', user = 'testuser', passwd = 'testpass')
+conn = PostgresConnection(db = 'testdb', user = 'testuser', password = 'testpass')
class Person(SQLObject):
_connection = conn
@@ -103,7 +103,7 @@
Bullet("Let's give a Person some PhoneNumbers:",
PRE("""\
from SQLObject import *
-conn = PostgresConnection(db = 'testdb', user = 'testuser', passwd = 'testpass')
+conn = PostgresConnection(db = 'testdb', user = 'testuser', password = 'testpass')
class Person(SQLObject):
_connection = conn
Modified: SQLObject/trunk/docs/europython/person.py
===================================================================
--- SQLObject/trunk/docs/europython/person.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/docs/europython/person.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -1,5 +1,5 @@
from SQLObject import *
-conn = PostgresConnection(db = 'merchant_test', user = 'merchant_test', passwd = 'mtest')
+conn = PostgresConnection(db = 'merchant_test', user = 'merchant_test', password = 'mtest')
class Role(SQLObject):
_connection = conn
Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -10,7 +10,7 @@
schemes = [dbName]
def __init__(self, host, db, user='sysdba',
- passwd='masterkey', autoCommit=1,
+ password='masterkey', autoCommit=1,
dialect=None, role=None, charset=None, **kw):
global kinterbasdb
if kinterbasdb is None:
@@ -22,7 +22,7 @@
self.host = host
self.db = db
self.user = user
- self.passwd = passwd
+ self.password = password
if dialect:
self.dialect = int(dialect)
else:
@@ -42,7 +42,7 @@
# strip the leading slash off of db name/alias
path = path[1:]
path = path.replace('/', os.sep)
- return cls(host, db=path, user=auth, passwd=password, **args)
+ return cls(host, db=path, user=auth, password=password, **args)
connectionFromURI = classmethod(connectionFromURI)
def _runWithConnection(self, meth, *args):
@@ -77,7 +77,7 @@
host=self.host,
database=self.db,
user=self.user,
- password=self.passwd,
+ password=self.password,
role=self.role,
charset=self.charset,
**extra
Modified: SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -80,7 +80,7 @@
def connectionFromURI(cls, uri):
auth, password, host, port, path, args = cls._parseURI(uri)
path = path.replace('/', os.path.sep)
- return cls(host, db=path, user=auth, passwd=password, **args)
+ return cls(host, db=path, user=auth, password=password, **args)
connectionFromURI = classmethod(connectionFromURI)
def _getConfigParams(self,sqlmode,auto):
Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -8,7 +8,7 @@
dbName = 'mysql'
schemes = [dbName]
- def __init__(self, db, user, passwd='', host='localhost', port=None, **kw):
+ def __init__(self, db, user, password='', host='localhost', port=None, **kw):
global MySQLdb
if MySQLdb is None:
import MySQLdb
@@ -17,7 +17,7 @@
self.port = port
self.db = db
self.user = user
- self.password = passwd
+ self.password = password
self.kw = {}
for key in ("unix_socket", "named_pipe", "init_command",
"read_default_file", "read_default_group"):
@@ -31,7 +31,7 @@
def connectionFromURI(cls, uri):
user, password, host, port, path, args = cls._parseURI(uri)
- return cls(db=path.strip('/'), user=user or '', passwd=password or '',
+ return cls(db=path.strip('/'), user=user or '', password=password or '',
host=host or 'localhost', port=port or 0, **args)
connectionFromURI = classmethod(connectionFromURI)
Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -13,7 +13,7 @@
schemes = [dbName, 'postgresql', 'psycopg']
def __init__(self, dsn=None, host=None, port=None, db=None,
- user=None, passwd=None, usePygresql=False, unicodeCols=False,
+ user=None, password=None, usePygresql=False, unicodeCols=False,
**kw):
global psycopg, pgdb
self.usePygresql = usePygresql
@@ -34,7 +34,7 @@
self.host = host
self.port = port
self.db = db
- self.password = passwd
+ self.password = password
self.dsn_dict = dsn_dict = {}
if host:
dsn_dict["host"] = host
@@ -47,8 +47,8 @@
dsn_dict["database"] = db
if user:
dsn_dict["user"] = user
- if passwd:
- dsn_dict["password"] = passwd
+ if password:
+ dsn_dict["password"] = password
self.use_dsn = dsn is not None
if dsn is None:
if usePygresql:
@@ -62,16 +62,16 @@
if user:
dsn += user
dsn += ':'
- if passwd:
- dsn += passwd
+ if password:
+ dsn += password
else:
dsn = []
if db:
dsn.append('dbname=%s' % db)
if user:
dsn.append('user=%s' % user)
- if passwd:
- dsn.append('password=%s' % passwd)
+ if password:
+ dsn.append('password=%s' % password)
if host:
dsn.append('host=%s' % host)
if port:
@@ -87,7 +87,7 @@
def connectionFromURI(cls, uri):
user, password, host, port, path, args = cls._parseURI(uri)
path = path.strip('/')
- return cls(host=host, port=port, db=path, user=user, passwd=password, **args)
+ return cls(host=host, port=port, db=path, user=user, password=password, **args)
connectionFromURI = classmethod(connectionFromURI)
def _setAutoCommit(self, conn, auto):
Modified: SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sybase/sybaseconnection.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/sybase/sybaseconnection.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -8,7 +8,7 @@
dbName = 'sybase'
schemes = [dbName]
- def __init__(self, db, user, passwd='', host='localhost',
+ def __init__(self, db, user, password='', host='localhost',
locking=1, **kw):
db = db.strip('/')
global Sybase
@@ -23,7 +23,7 @@
self.host = host
self.db = db
self.user = user
- self.passwd = passwd
+ self.password = password
autoCommit = kw.get('autoCommit')
if autoCommit:
autoCommmit = int(autoCommit)
@@ -34,7 +34,7 @@
def connectionFromURI(cls, uri):
user, password, host, port, path, args = cls._parseURI(uri)
- return cls(user=user, passwd=password, host=host or 'localhost',
+ return cls(user=user, password=password, host=host or 'localhost',
db=path, **args)
connectionFromURI = classmethod(connectionFromURI)
@@ -48,7 +48,7 @@
return c.fetchone()[0]
def makeConnection(self):
- return Sybase.connect(self.host, self.user, self.passwd,
+ return Sybase.connect(self.host, self.user, self.password,
database=self.db, auto_commit=self.autoCommit,
locking=self.locking)
Modified: SQLObject/trunk/sqlobject/tests/test_parse.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_parse.py 2005-10-03 01:43:55 UTC (rev 1071)
+++ SQLObject/trunk/sqlobject/tests/test_parse.py 2005-10-03 10:07:29 UTC (rev 1072)
@@ -8,9 +8,9 @@
def test_parse():
_parseURI = DBConnection._parseURI
- user, password, host, port, path, args = _parseURI("mysql://user:passwd@host/database")
+ user, password, host, port, path, args = _parseURI("mysql://user:password@host/database")
assert user == "user"
- assert password == "passwd"
+ assert password == "password"
assert host == "host"
assert port is None
assert path == "/database"
|
