[Sqlalchemy-commits] [1449] sqlalchemy/branches/schema/lib/sqlalchemy/schema.py: explicit 'exception
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1449] sqlalchemy/branches/schema/lib/sqlalchemy/schema.py: explicit 'exceptions' namespsace for ArgumentErrors
|
From: <co...@sq...> - 2006-05-13 00:50:31
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1449] sqlalchemy/branches/schema/lib/sqlalchemy/schema.py: explicit 'exceptions' namespsace for ArgumentErrors</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1449</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-12 19:50:23 -0500 (Fri, 12 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>explicit 'exceptions' namespsace for ArgumentErrors</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemalibsqlalchemyschemapy">sqlalchemy/branches/schema/lib/sqlalchemy/schema.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemalibsqlalchemyschemapy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/schema.py (1448 => 1449)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-13 00:46:51 UTC (rev 1448) +++ sqlalchemy/branches/schema/lib/sqlalchemy/schema.py 2006-05-13 00:50:23 UTC (rev 1449) </span><span class="lines">@@ -70,11 +70,11 @@ </span><span class="cx"> if redefine: </span><span class="cx"> table.reload_values(*args) </span><span class="cx"> elif not useexisting: </span><del>- raise ArgumentError("Table '%s.%s' is already defined. specify 'redefine=True' to remap columns, or 'useexisting=True' to use the existing table" % (schema, name)) </del><ins>+ raise exceptions.ArgumentError("Table '%s.%s' is already defined. specify 'redefine=True' to remap columns, or 'useexisting=True' to use the existing table" % (schema, name)) </ins><span class="cx"> return table </span><span class="cx"> except KeyError: </span><span class="cx"> if mustexist: </span><del>- raise ArgumentError("Table '%s.%s' not defined" % (schema, name)) </del><ins>+ raise exceptions.ArgumentError("Table '%s.%s' not defined" % (schema, name)) </ins><span class="cx"> table = type.__call__(self, name, metadata, **kwargs) </span><span class="cx"> table._set_parent(metadata) </span><span class="cx"> # load column definitions from the database if 'autoload' is defined </span><span class="lines">@@ -298,10 +298,10 @@ </span><span class="cx"> self.unique = kwargs.pop('unique', None) </span><span class="cx"> self.onupdate = kwargs.pop('onupdate', None) </span><span class="cx"> if self.index is not None and self.unique is not None: </span><del>- raise ArgumentError("Column may not define both index and unique") </del><ins>+ raise exceptions.ArgumentError("Column may not define both index and unique") </ins><span class="cx"> self._foreign_key = None </span><span class="cx"> if len(kwargs): </span><del>- raise ArgumentError("Unknown arguments passed to Column: " + repr(kwargs.keys())) </del><ins>+ raise exceptions.ArgumentError("Unknown arguments passed to Column: " + repr(kwargs.keys())) </ins><span class="cx"> </span><span class="cx"> primary_key = util.SimpleProperty('_primary_key') </span><span class="cx"> foreign_key = util.SimpleProperty('_foreign_key') </span><span class="lines">@@ -331,7 +331,7 @@ </span><span class="cx"> </span><span class="cx"> def _set_parent(self, table): </span><span class="cx"> if getattr(self, 'table', None) is not None: </span><del>- raise ArgumentError("this Column already has a table!") </del><ins>+ raise exceptions.ArgumentError("this Column already has a table!") </ins><span class="cx"> table.append_column(self) </span><span class="cx"> if self.index or self.unique: </span><span class="cx"> table.append_index_column(self, index=self.index, </span><span class="lines">@@ -423,7 +423,7 @@ </span><span class="cx"> if isinstance(self._colspec, str): </span><span class="cx"> m = re.match(r"^([\w_-]+)(?:\.([\w_-]+))?(?:\.([\w_-]+))?$", self._colspec) </span><span class="cx"> if m is None: </span><del>- raise ArgumentError("Invalid foreign key column specification: " + self._colspec) </del><ins>+ raise exceptions.ArgumentError("Invalid foreign key column specification: " + self._colspec) </ins><span class="cx"> if m.group(3) is None: </span><span class="cx"> (tname, colname) = m.group(1, 2) </span><span class="cx"> schema = list(self.parent.orig_set)[0].table.schema </span><span class="lines">@@ -562,12 +562,12 @@ </span><span class="cx"> self.table.append_index(self) </span><span class="cx"> elif column.table != self.table: </span><span class="cx"> # all columns muse be from same table </span><del>- raise ArgumentError("All index columns must be from same table. " </del><ins>+ raise exceptions.ArgumentError("All index columns must be from same table. " </ins><span class="cx"> "%s is from %s not %s" % (column, </span><span class="cx"> column.table, </span><span class="cx"> self.table)) </span><span class="cx"> elif column.name in [ c.name for c in self.columns ]: </span><del>- raise ArgumentError("A column may not appear twice in the " </del><ins>+ raise exceptions.ArgumentError("A column may not appear twice in the " </ins><span class="cx"> "same index (%s already has column %s)" </span><span class="cx"> % (self.name, column)) </span><span class="cx"> self.columns.append(column) </span></span></pre> </div> </div> </body> </html> |
