Revision: 593
http://rpy.svn.sourceforge.net/rpy/?rev=593&view=rev
Author: lgautier
Date: 2008-07-24 19:30:38 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
renamed rlike.container.NamedList to rlike.container.ArgsDict
Modified Paths:
--------------
branches/rpy_nextgen/NEWS
branches/rpy_nextgen/rpy/rlike/container.py
branches/rpy_nextgen/rpy/rlike/tests/test_container.py
Modified: branches/rpy_nextgen/NEWS
===================================================================
--- branches/rpy_nextgen/NEWS 2008-07-24 14:09:54 UTC (rev 592)
+++ branches/rpy_nextgen/NEWS 2008-07-24 19:30:38 UTC (rev 593)
@@ -9,7 +9,7 @@
- package for R-like features in Python
-- module :mod:`rpy2.rlike.container` with the class :class:`NamedList`.
+- module :mod:`rpy2.rlike.container` with the class :class:`ArgsDict`.
:mod:`rpy2.rinterface`:
Modified: branches/rpy_nextgen/rpy/rlike/container.py
===================================================================
--- branches/rpy_nextgen/rpy/rlike/container.py 2008-07-24 14:09:54 UTC (rev
592)
+++ branches/rpy_nextgen/rpy/rlike/container.py 2008-07-24 19:30:38 UTC (rev
593)
@@ -1,4 +1,4 @@
-class NamedList(dict):
+class ArgsDict(dict):
""" Implements the Ordered Dict API defined in PEP 372.
When `odict` becomes part of collections, this class
should inherit from it rather than from `dict`.
@@ -16,11 +16,11 @@
def __init__(self, c=[]):
if isinstance(c, dict):
- #FIXME: allow instance from NamedList ?
+ #FIXME: allow instance from ArgsDict ?
raise ValueError('A regular dictionnary does not ' +\
'conserve the order of its keys.')
- super(NamedList, self).__init__()
+ super(ArgsDict, self).__init__()
self.__l = []
l = self.__l
@@ -37,7 +37,7 @@
def __getitem__(self, key):
if key is None:
raise ValueError("Unnamed items cannot be retrieved by key.")
- i = super(NamedList, self).__getitem__(key)
+ i = super(ArgsDict, self).__getitem__(key)
return self.__l[i][1]
def __iter__(self):
@@ -79,7 +79,7 @@
self.__l[i] = (key, value)
else:
self.__l.append((key, value))
- super(NamedList, self).__setitem__(key, len(self.__l)-1)
+ super(ArgsDict, self).__setitem__(key, len(self.__l)-1)
def byindex(self, i):
""" Fetch a value by index (rank), rather than by key."""
@@ -87,7 +87,7 @@
def index(self, k):
""" Return the index (rank) for the key 'k' """
- return super(NamedList, self).__getitem__(k)
+ return super(ArgsDict, self).__getitem__(k)
def items(self):
""" Return an ordered list of all key/value pairs """
@@ -106,11 +106,11 @@
l[i] = l[n-i-1]
kv = l[i]
if kv is not None:
- super(NamedList, self).__setitem__(kv[0], i)
+ super(ArgsDict, self).__setitem__(kv[0], i)
l[n-i-1] = tmp
kv = tmp
if kv is not None:
- super(NamedList, self).__setitem__(kv[0], n-i-1)
+ super(ArgsDict, self).__setitem__(kv[0], n-i-1)
def sort(self, cmp=None, key=None, reverse=False):
Modified: branches/rpy_nextgen/rpy/rlike/tests/test_container.py
===================================================================
--- branches/rpy_nextgen/rpy/rlike/tests/test_container.py 2008-07-24
14:09:54 UTC (rev 592)
+++ branches/rpy_nextgen/rpy/rlike/tests/test_container.py 2008-07-24
19:30:38 UTC (rev 593)
@@ -2,16 +2,16 @@
import itertools
import rpy2.rlike.container as rlc
-class NamedListTestCase(unittest.TestCase):
+class ArgsDictTestCase(unittest.TestCase):
def testNew(self):
- nl = rlc.NamedList()
+ nl = rlc.ArgsDict()
x = (('a', 123), ('b', 456), ('c', 789))
- nl = rlc.NamedList(x)
+ nl = rlc.ArgsDict(x)
def testLen(self):
- x = rlc.NamedList()
+ x = rlc.ArgsDict()
self.assertEquals(0, len(x))
x['a'] = 2
@@ -20,7 +20,7 @@
self.assertEquals(2, len(x))
def testGetSetitem(self):
- x = rlc.NamedList()
+ x = rlc.ArgsDict()
x['a'] = 1
self.assertEquals(1, len(x))
@@ -36,7 +36,7 @@
self.assertEquals(1, x.index('b'))
def testGetSetitemWithNone(self):
- x = rlc.NamedList()
+ x = rlc.ArgsDict()
x['a'] = 1
x[None] = 2
@@ -49,7 +49,7 @@
self.assertEquals(2, x.index('b'))
def testReverse(self):
- x = rlc.NamedList()
+ x = rlc.ArgsDict()
x['a'] = 3
x['b'] = 2
x['c'] = 1
@@ -66,7 +66,7 @@
def f(**kwargs):
return [k for k in kwargs]
- x = rlc.NamedList()
+ x = rlc.ArgsDict()
x['a'] = 3
x['b'] = 2
x['c'] = 1
@@ -76,7 +76,7 @@
self.assertTrue(ki, ko)
def suite():
- suite = unittest.TestLoader().loadTestsFromTestCase(NamedListTestCase)
+ suite = unittest.TestLoader().loadTestsFromTestCase(ArgsDictTestCase)
return suite
if __name__ == '__main__':
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
