Ignore:
Timestamp:
Jan 20, 2016, 1:22:10 PM (4 years ago)
Author:
cito
Message:

Back port some minor fixes from the trunk

This also gives better error message if test runner does not support unittest2.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.x/docs/contents/pg/db_wrapper.rst

    r769 r771  
    145145    :rtype: str, list or dict
    146146    :raises TypeError: Invalid parameter type(s)
    147     :raises ProgrammingError: Invalid parameter name(s)
     147    :raises pg.ProgrammingError: Invalid parameter name(s)
    148148
    149149If the parameter is a string, the return value will also be a string
     
    163163.. versionadded:: 4.2
    164164
    165 .. method:: DB.set_parameter(self, parameter, [value], [local])
     165.. method:: DB.set_parameter(parameter, [value], [local])
    166166
    167167    Set the value of run-time parameters
     
    173173    :raises TypeError: Invalid parameter type(s)
    174174    :raises ValueError: Invalid value argument(s)
    175     :raises ProgrammingError: Invalid parameter name(s) or values
     175    :raises pg.ProgrammingError: Invalid parameter name(s) or values
    176176
    177177If the parameter and the value are strings, the run-time parameter
     
    296296    :returns: A dictionary - the keys are the attribute names,
    297297      the values are the row values.
    298     :raises ProgrammingError: no primary key or missing privilege
     298    :raises pg.ProgrammingError: no primary key or missing privilege
    299299
    300300This method is the basic mechanism to get a single row.  It assumes
     
    319319    :returns: the inserted values in the database
    320320    :rtype: dict
    321     :raises ProgrammingError: missing privilege or conflict
     321    :raises pg.ProgrammingError: missing privilege or conflict
    322322
    323323This method inserts a row into a table.  If the optional dictionary is
     
    340340    :returns: the new row in the database
    341341    :rtype: dict
    342     :raises ProgrammingError: no primary key or missing privilege
     342    :raises pg.ProgrammingError: no primary key or missing privilege
    343343
    344344Similar to insert but updates an existing row.  The update is based on the
     
    413413    :param dict d: optional dictionary of values
    414414    :rtype: None
    415     :raises ProgrammingError: table has no primary key,
     415    :raises pg.ProgrammingError: table has no primary key,
    416416        row is still referenced or missing privilege
    417417
     
    421421row did not exist and 1 if the row was deleted).
    422422
    423 truncate -- Quickly empty database tables
     423truncate -- quickly empty database tables
    424424-----------------------------------------
    425425
    426 .. method:: DB.truncate(self, table, [restart], [cascade], [only]):
     426.. method:: DB.truncate(table, [restart], [cascade], [only])
    427427
    428428    Empty a table or set of tables
Note: See TracChangeset for help on using the changeset viewer.