Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • python/trunk

  • python/trunk/Lib/bsddb/dbobj.py

    r2 r391  
    3030    import db
    3131
    32 if sys.version_info[0:2] <= (2, 5) :
    33     try:
    34         from UserDict import DictMixin
    35     except ImportError:
    36         # DictMixin is new in Python 2.3
    37         class DictMixin: pass
    38     MutableMapping = DictMixin
     32if sys.version_info < (2, 6) :
     33    from UserDict import DictMixin as MutableMapping
    3934else :
    4035    import collections
    … …  
    4338class DBEnv:
    4439    def __init__(self, *args, **kwargs):
    45         self._cobj = apply(db.DBEnv, args, kwargs)
     40        self._cobj = db.DBEnv(*args, **kwargs)
    4641
    4742    def close(self, *args, **kwargs):
    48         return apply(self._cobj.close, args, kwargs)
     43        return self._cobj.close(*args, **kwargs)
    4944    def open(self, *args, **kwargs):
    50         return apply(self._cobj.open, args, kwargs)
     45        return self._cobj.open(*args, **kwargs)
    5146    def remove(self, *args, **kwargs):
    52         return apply(self._cobj.remove, args, kwargs)
     47        return self._cobj.remove(*args, **kwargs)
    5348    def set_shm_key(self, *args, **kwargs):
    54         return apply(self._cobj.set_shm_key, args, kwargs)
     49        return self._cobj.set_shm_key(*args, **kwargs)
    5550    def set_cachesize(self, *args, **kwargs):
    56         return apply(self._cobj.set_cachesize, args, kwargs)
     51        return self._cobj.set_cachesize(*args, **kwargs)
    5752    def set_data_dir(self, *args, **kwargs):
    58         return apply(self._cobj.set_data_dir, args, kwargs)
     53        return self._cobj.set_data_dir(*args, **kwargs)
    5954    def set_flags(self, *args, **kwargs):
    60         return apply(self._cobj.set_flags, args, kwargs)
     55        return self._cobj.set_flags(*args, **kwargs)
    6156    def set_lg_bsize(self, *args, **kwargs):
    62         return apply(self._cobj.set_lg_bsize, args, kwargs)
     57        return self._cobj.set_lg_bsize(*args, **kwargs)
    6358    def set_lg_dir(self, *args, **kwargs):
    64         return apply(self._cobj.set_lg_dir, args, kwargs)
     59        return self._cobj.set_lg_dir(*args, **kwargs)
    6560    def set_lg_max(self, *args, **kwargs):
    66         return apply(self._cobj.set_lg_max, args, kwargs)
     61        return self._cobj.set_lg_max(*args, **kwargs)
    6762    def set_lk_detect(self, *args, **kwargs):
    68         return apply(self._cobj.set_lk_detect, args, kwargs)
     63        return self._cobj.set_lk_detect(*args, **kwargs)
    6964    if db.version() < (4,5):
    7065        def set_lk_max(self, *args, **kwargs):
    71             return apply(self._cobj.set_lk_max, args, kwargs)
     66            return self._cobj.set_lk_max(*args, **kwargs)
    7267    def set_lk_max_locks(self, *args, **kwargs):
    73         return apply(self._cobj.set_lk_max_locks, args, kwargs)
     68        return self._cobj.set_lk_max_locks(*args, **kwargs)
    7469    def set_lk_max_lockers(self, *args, **kwargs):
    75         return apply(self._cobj.set_lk_max_lockers, args, kwargs)
     70        return self._cobj.set_lk_max_lockers(*args, **kwargs)
    7671    def set_lk_max_objects(self, *args, **kwargs):
    77         return apply(self._cobj.set_lk_max_objects, args, kwargs)
     72        return self._cobj.set_lk_max_objects(*args, **kwargs)
    7873    def set_mp_mmapsize(self, *args, **kwargs):
    79         return apply(self._cobj.set_mp_mmapsize, args, kwargs)
     74        return self._cobj.set_mp_mmapsize(*args, **kwargs)
    8075    def set_timeout(self, *args, **kwargs):
    81         return apply(self._cobj.set_timeout, args, kwargs)
     76        return self._cobj.set_timeout(*args, **kwargs)
    8277    def set_tmp_dir(self, *args, **kwargs):
    83         return apply(self._cobj.set_tmp_dir, args, kwargs)
     78        return self._cobj.set_tmp_dir(*args, **kwargs)
    8479    def txn_begin(self, *args, **kwargs):
    85         return apply(self._cobj.txn_begin, args, kwargs)
     80        return self._cobj.txn_begin(*args, **kwargs)
    8681    def txn_checkpoint(self, *args, **kwargs):
    87         return apply(self._cobj.txn_checkpoint, args, kwargs)
     82        return self._cobj.txn_checkpoint(*args, **kwargs)
    8883    def txn_stat(self, *args, **kwargs):
    89         return apply(self._cobj.txn_stat, args, kwargs)
     84        return self._cobj.txn_stat(*args, **kwargs)
    9085    def set_tx_max(self, *args, **kwargs):
    91         return apply(self._cobj.set_tx_max, args, kwargs)
     86        return self._cobj.set_tx_max(*args, **kwargs)
    9287    def set_tx_timestamp(self, *args, **kwargs):
    93         return apply(self._cobj.set_tx_timestamp, args, kwargs)
     88        return self._cobj.set_tx_timestamp(*args, **kwargs)
    9489    def lock_detect(self, *args, **kwargs):
    95         return apply(self._cobj.lock_detect, args, kwargs)
     90        return self._cobj.lock_detect(*args, **kwargs)
    9691    def lock_get(self, *args, **kwargs):
    97         return apply(self._cobj.lock_get, args, kwargs)
     92        return self._cobj.lock_get(*args, **kwargs)
    9893    def lock_id(self, *args, **kwargs):
    99         return apply(self._cobj.lock_id, args, kwargs)
     94        return self._cobj.lock_id(*args, **kwargs)
    10095    def lock_put(self, *args, **kwargs):
    101         return apply(self._cobj.lock_put, args, kwargs)
     96        return self._cobj.lock_put(*args, **kwargs)
    10297    def lock_stat(self, *args, **kwargs):
    103         return apply(self._cobj.lock_stat, args, kwargs)
     98        return self._cobj.lock_stat(*args, **kwargs)
    10499    def log_archive(self, *args, **kwargs):
    105         return apply(self._cobj.log_archive, args, kwargs)
     100        return self._cobj.log_archive(*args, **kwargs)
    106101
    107102    def set_get_returns_none(self, *args, **kwargs):
    108         return apply(self._cobj.set_get_returns_none, args, kwargs)
     103        return self._cobj.set_get_returns_none(*args, **kwargs)
    109104
    110105    def log_stat(self, *args, **kwargs):
    111         return apply(self._cobj.log_stat, args, kwargs)
    112 
    113     if db.version() >= (4,1):
    114         def dbremove(self, *args, **kwargs):
    115             return apply(self._cobj.dbremove, args, kwargs)
    116         def dbrename(self, *args, **kwargs):
    117             return apply(self._cobj.dbrename, args, kwargs)
    118         def set_encrypt(self, *args, **kwargs):
    119             return apply(self._cobj.set_encrypt, args, kwargs)
     106        return self._cobj.log_stat(*args, **kwargs)
     107
     108    def dbremove(self, *args, **kwargs):
     109        return self._cobj.dbremove(*args, **kwargs)
     110    def dbrename(self, *args, **kwargs):
     111        return self._cobj.dbrename(*args, **kwargs)
     112    def set_encrypt(self, *args, **kwargs):
     113        return self._cobj.set_encrypt(*args, **kwargs)
    120114
    121115    if db.version() >= (4,4):
     116        def fileid_reset(self, *args, **kwargs):
     117            return self._cobj.fileid_reset(*args, **kwargs)
     118
    122119        def lsn_reset(self, *args, **kwargs):
    123             return apply(self._cobj.lsn_reset, args, kwargs)
     120            return self._cobj.lsn_reset(*args, **kwargs)
    124121
    125122
    … …  
    127124    def __init__(self, dbenv, *args, **kwargs):
    128125        # give it the proper DBEnv C object that its expecting
    129         self._cobj = apply(db.DB, (dbenv._cobj,) + args, kwargs)
     126        self._cobj = db.DB(*((dbenv._cobj,) + args), **kwargs)
    130127
    131128    # TODO are there other dict methods that need to be overridden?
    … …  
    139136        del self._cobj[arg]
    140137
    141     if sys.version_info[0:2] >= (2, 6) :
     138    if sys.version_info >= (2, 6) :
    142139        def __iter__(self) :
    143140            return self._cobj.__iter__()
    144141
    145142    def append(self, *args, **kwargs):
    146         return apply(self._cobj.append, args, kwargs)
     143        return self._cobj.append(*args, **kwargs)
    147144    def associate(self, *args, **kwargs):
    148         return apply(self._cobj.associate, args, kwargs)
     145        return self._cobj.associate(*args, **kwargs)
    149146    def close(self, *args, **kwargs):
    150         return apply(self._cobj.close, args, kwargs)
     147        return self._cobj.close(*args, **kwargs)
    151148    def consume(self, *args, **kwargs):
    152         return apply(self._cobj.consume, args, kwargs)
     149        return self._cobj.consume(*args, **kwargs)
    153150    def consume_wait(self, *args, **kwargs):
    154         return apply(self._cobj.consume_wait, args, kwargs)
     151        return self._cobj.consume_wait(*args, **kwargs)
    155152    def cursor(self, *args, **kwargs):
    156         return apply(self._cobj.cursor, args, kwargs)
     153        return self._cobj.cursor(*args, **kwargs)
    157154    def delete(self, *args, **kwargs):
    158         return apply(self._cobj.delete, args, kwargs)
     155        return self._cobj.delete(*args, **kwargs)
    159156    def fd(self, *args, **kwargs):
    160         return apply(self._cobj.fd, args, kwargs)
     157        return self._cobj.fd(*args, **kwargs)
    161158    def get(self, *args, **kwargs):
    162         return apply(self._cobj.get, args, kwargs)
     159        return self._cobj.get(*args, **kwargs)
    163160    def pget(self, *args, **kwargs):
    164         return apply(self._cobj.pget, args, kwargs)
     161        return self._cobj.pget(*args, **kwargs)
    165162    def get_both(self, *args, **kwargs):
    166         return apply(self._cobj.get_both, args, kwargs)
     163        return self._cobj.get_both(*args, **kwargs)
    167164    def get_byteswapped(self, *args, **kwargs):
    168         return apply(self._cobj.get_byteswapped, args, kwargs)
     165        return self._cobj.get_byteswapped(*args, **kwargs)
    169166    def get_size(self, *args, **kwargs):
    170         return apply(self._cobj.get_size, args, kwargs)
     167        return self._cobj.get_size(*args, **kwargs)
    171168    def get_type(self, *args, **kwargs):
    172         return apply(self._cobj.get_type, args, kwargs)
     169        return self._cobj.get_type(*args, **kwargs)
    173170    def join(self, *args, **kwargs):
    174         return apply(self._cobj.join, args, kwargs)
     171        return self._cobj.join(*args, **kwargs)
    175172    def key_range(self, *args, **kwargs):
    176         return apply(self._cobj.key_range, args, kwargs)
     173        return self._cobj.key_range(*args, **kwargs)
    177174    def has_key(self, *args, **kwargs):
    178         return apply(self._cobj.has_key, args, kwargs)
     175        return self._cobj.has_key(*args, **kwargs)
    179176    def items(self, *args, **kwargs):
    180         return apply(self._cobj.items, args, kwargs)
     177        return self._cobj.items(*args, **kwargs)
    181178    def keys(self, *args, **kwargs):
    182         return apply(self._cobj.keys, args, kwargs)
     179        return self._cobj.keys(*args, **kwargs)
    183180    def open(self, *args, **kwargs):
    184         return apply(self._cobj.open, args, kwargs)
     181        return self._cobj.open(*args, **kwargs)
    185182    def put(self, *args, **kwargs):
    186         return apply(self._cobj.put, args, kwargs)
     183        return self._cobj.put(*args, **kwargs)
    187184    def remove(self, *args, **kwargs):
    188         return apply(self._cobj.remove, args, kwargs)
     185        return self._cobj.remove(*args, **kwargs)
    189186    def rename(self, *args, **kwargs):
    190         return apply(self._cobj.rename, args, kwargs)
     187        return self._cobj.rename(*args, **kwargs)
    191188    def set_bt_minkey(self, *args, **kwargs):
    192         return apply(self._cobj.set_bt_minkey, args, kwargs)
     189        return self._cobj.set_bt_minkey(*args, **kwargs)
    193190    def set_bt_compare(self, *args, **kwargs):
    194         return apply(self._cobj.set_bt_compare, args, kwargs)
     191        return self._cobj.set_bt_compare(*args, **kwargs)
    195192    def set_cachesize(self, *args, **kwargs):
    196         return apply(self._cobj.set_cachesize, args, kwargs)
     193        return self._cobj.set_cachesize(*args, **kwargs)
     194    def set_dup_compare(self, *args, **kwargs) :
     195        return self._cobj.set_dup_compare(*args, **kwargs)
    197196    def set_flags(self, *args, **kwargs):
    198         return apply(self._cobj.set_flags, args, kwargs)
     197        return self._cobj.set_flags(*args, **kwargs)
    199198    def set_h_ffactor(self, *args, **kwargs):
    200         return apply(self._cobj.set_h_ffactor, args, kwargs)
     199        return self._cobj.set_h_ffactor(*args, **kwargs)
    201200    def set_h_nelem(self, *args, **kwargs):
    202         return apply(self._cobj.set_h_nelem, args, kwargs)
     201        return self._cobj.set_h_nelem(*args, **kwargs)
    203202    def set_lorder(self, *args, **kwargs):
    204         return apply(self._cobj.set_lorder, args, kwargs)
     203        return self._cobj.set_lorder(*args, **kwargs)
    205204    def set_pagesize(self, *args, **kwargs):
    206         return apply(self._cobj.set_pagesize, args, kwargs)
     205        return self._cobj.set_pagesize(*args, **kwargs)
    207206    def set_re_delim(self, *args, **kwargs):
    208         return apply(self._cobj.set_re_delim, args, kwargs)
     207        return self._cobj.set_re_delim(*args, **kwargs)
    209208    def set_re_len(self, *args, **kwargs):
    210         return apply(self._cobj.set_re_len, args, kwargs)
     209        return self._cobj.set_re_len(*args, **kwargs)
    211210    def set_re_pad(self, *args, **kwargs):
    212         return apply(self._cobj.set_re_pad, args, kwargs)
     211        return self._cobj.set_re_pad(*args, **kwargs)
    213212    def set_re_source(self, *args, **kwargs):
    214         return apply(self._cobj.set_re_source, args, kwargs)
     213        return self._cobj.set_re_source(*args, **kwargs)
    215214    def set_q_extentsize(self, *args, **kwargs):
    216         return apply(self._cobj.set_q_extentsize, args, kwargs)
     215        return self._cobj.set_q_extentsize(*args, **kwargs)
    217216    def stat(self, *args, **kwargs):
    218         return apply(self._cobj.stat, args, kwargs)
     217        return self._cobj.stat(*args, **kwargs)
    219218    def sync(self, *args, **kwargs):
    220         return apply(self._cobj.sync, args, kwargs)
     219        return self._cobj.sync(*args, **kwargs)
    221220    def type(self, *args, **kwargs):
    222         return apply(self._cobj.type, args, kwargs)
     221        return self._cobj.type(*args, **kwargs)
    223222    def upgrade(self, *args, **kwargs):
    224         return apply(self._cobj.upgrade, args, kwargs)
     223        return self._cobj.upgrade(*args, **kwargs)
    225224    def values(self, *args, **kwargs):
    226         return apply(self._cobj.values, args, kwargs)
     225        return self._cobj.values(*args, **kwargs)
    227226    def verify(self, *args, **kwargs):
    228         return apply(self._cobj.verify, args, kwargs)
     227        return self._cobj.verify(*args, **kwargs)
    229228    def set_get_returns_none(self, *args, **kwargs):
    230         return apply(self._cobj.set_get_returns_none, args, kwargs)
    231 
    232     if db.version() >= (4,1):
    233         def set_encrypt(self, *args, **kwargs):
    234             return apply(self._cobj.set_encrypt, args, kwargs)
     229        return self._cobj.set_get_returns_none(*args, **kwargs)
     230
     231    def set_encrypt(self, *args, **kwargs):
     232        return self._cobj.set_encrypt(*args, **kwargs)
    235233
    236234
    237235class DBSequence:
    238236    def __init__(self, *args, **kwargs):
    239         self._cobj = apply(db.DBSequence, args, kwargs)
     237        self._cobj = db.DBSequence(*args, **kwargs)
    240238
    241239    def close(self, *args, **kwargs):
    242         return apply(self._cobj.close, args, kwargs)
     240        return self._cobj.close(*args, **kwargs)
    243241    def get(self, *args, **kwargs):
    244         return apply(self._cobj.get, args, kwargs)
     242        return self._cobj.get(*args, **kwargs)
    245243    def get_dbp(self, *args, **kwargs):
    246         return apply(self._cobj.get_dbp, args, kwargs)
     244        return self._cobj.get_dbp(*args, **kwargs)
    247245    def get_key(self, *args, **kwargs):
    248         return apply(self._cobj.get_key, args, kwargs)
     246        return self._cobj.get_key(*args, **kwargs)
    249247    def init_value(self, *args, **kwargs):
    250         return apply(self._cobj.init_value, args, kwargs)
     248        return self._cobj.init_value(*args, **kwargs)
    251249    def open(self, *args, **kwargs):
    252         return apply(self._cobj.open, args, kwargs)
     250        return self._cobj.open(*args, **kwargs)
    253251    def remove(self, *args, **kwargs):
    254         return apply(self._cobj.remove, args, kwargs)
     252        return self._cobj.remove(*args, **kwargs)
    255253    def stat(self, *args, **kwargs):
    256         return apply(self._cobj.stat, args, kwargs)
     254        return self._cobj.stat(*args, **kwargs)
    257255    def set_cachesize(self, *args, **kwargs):
    258         return apply(self._cobj.set_cachesize, args, kwargs)
     256        return self._cobj.set_cachesize(*args, **kwargs)
    259257    def set_flags(self, *args, **kwargs):
    260         return apply(self._cobj.set_flags, args, kwargs)
     258        return self._cobj.set_flags(*args, **kwargs)
    261259    def set_range(self, *args, **kwargs):
    262         return apply(self._cobj.set_range, args, kwargs)
     260        return self._cobj.set_range(*args, **kwargs)
    263261    def get_cachesize(self, *args, **kwargs):
    264         return apply(self._cobj.get_cachesize, args, kwargs)
     262        return self._cobj.get_cachesize(*args, **kwargs)
    265263    def get_flags(self, *args, **kwargs):
    266         return apply(self._cobj.get_flags, args, kwargs)
     264        return self._cobj.get_flags(*args, **kwargs)
    267265    def get_range(self, *args, **kwargs):
    268         return apply(self._cobj.get_range, args, kwargs)
     266        return self._cobj.get_range(*args, **kwargs)
Note: See TracChangeset for help on using the changeset viewer.