You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by js...@apache.org on 2011/04/04 07:57:30 UTC
svn commit: r1088494 - in /incubator/nuvem/trunk/nuvem-parallel:
nuvem/assoc.py nuvem/button.py nuvem/format_.py nuvem/now.py nuvem/pair.py
nuvem/param.py nuvem/parse.py nuvem/widget.py test.py
Author: jsdelfino
Date: Mon Apr 4 07:57:30 2011
New Revision: 1088494
URL: http://svn.apache.org/viewvc?rev=1088494&view=rev
Log:
Refactor and cleanup assoc. button, format and parse components. Add a date component.
Added:
incubator/nuvem/trunk/nuvem-parallel/nuvem/now.py
- copied, changed from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py
incubator/nuvem/trunk/nuvem-parallel/nuvem/pair.py
- copied, changed from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py
incubator/nuvem/trunk/nuvem-parallel/nuvem/param.py
- copied, changed from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py
incubator/nuvem/trunk/nuvem-parallel/nuvem/widget.py
- copied, changed from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/button.py
Removed:
incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py
incubator/nuvem/trunk/nuvem-parallel/nuvem/button.py
Modified:
incubator/nuvem/trunk/nuvem-parallel/nuvem/format_.py
incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py
incubator/nuvem/trunk/nuvem-parallel/test.py
Modified: incubator/nuvem/trunk/nuvem-parallel/nuvem/format_.py
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/format_.py?rev=1088494&r1=1088493&r2=1088494&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/format_.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/format_.py Mon Apr 4 07:57:30 2011
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-def get(r, f, a):
+def get(r, fmt, args):
def isList(v):
if getattr(v, '__iter__', False) == False:
return False
@@ -32,9 +32,9 @@ def get(r, f, a):
return True
return False
- l = a.get(r)
+ l = args.get(r)
la = filter(lambda x: not isAssoc(x), l)
ka = dict(map(lambda x: (x[0][1:], x[1]), filter(lambda x: isAssoc(x), l)))
- return f.get(r).format(*la, **ka)
+ return fmt.get(r).format(*la, **ka)
Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/now.py (from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/now.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/now.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py&r1=1085836&r2=1088494&rev=1088494&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/now.py Mon Apr 4 07:57:30 2011
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-def get(r, a, b):
- return (a.get(r), b.get(r))
+def get(r):
+ from datetime import datetime
+ return datetime.now().ctime()
Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/pair.py (from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/pair.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/pair.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/assoc.py&r1=1085836&r2=1088494&rev=1088494&view=diff
==============================================================================
(empty)
Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/param.py (from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/param.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/param.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py&r1=1085836&r2=1088494&rev=1088494&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/param.py Mon Apr 4 07:57:30 2011
@@ -15,9 +15,14 @@
# specific language governing permissions and limitations
# under the License.
-import re
+def get(r, n, prop):
+ def lookup(nv, lv):
+ if lv == ():
+ return None
+ a = lv[0]
+ if a[0] == nv:
+ return a[1]
+ return lookup(nv, lv[1:])
-def get(r, e, s):
- m = re.search(e.get(r), s.get(r))
- return () if m is None else m.groups()
+ return lookup(n.get(r), prop.eval())
Modified: incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py?rev=1088494&r1=1088493&r2=1088494&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/parse.py Mon Apr 4 07:57:30 2011
@@ -17,7 +17,7 @@
import re
-def get(r, e, s):
- m = re.search(e.get(r), s.get(r))
+def get(r, expr, s):
+ m = re.search(expr.get(r), s.get(r))
return () if m is None else m.groups()
Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/widget.py (from r1085836, incubator/nuvem/trunk/nuvem-parallel/nuvem/button.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/widget.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/widget.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/button.py&r1=1085836&r2=1088494&rev=1088494&view=diff
==============================================================================
(empty)
Modified: incubator/nuvem/trunk/nuvem-parallel/test.py
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/test.py?rev=1088494&r1=1088493&r2=1088494&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/test.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/test.py Mon Apr 4 07:57:30 2011
@@ -29,7 +29,7 @@ from nuvem import number
from nuvem import text
from nuvem import name
from nuvem import nothing
-from nuvem import assoc
+from nuvem import pair
from nuvem import if_
from nuvem import and_
from nuvem import or_
@@ -58,6 +58,7 @@ from nuvem import divide
from nuvem import host
from nuvem import path
from nuvem import params
+from nuvem import param
from nuvem import user
from nuvem import realm
from nuvem import email
@@ -79,7 +80,7 @@ def testValues():
assert number.get((), mkprop('value', lambda: 1)) == 1
assert text.get((), mkprop('value', lambda: 'abc')) == 'abc'
assert name.get((), mkprop('value', lambda: 'abc')) == "'abc"
- assert assoc.get((), mkref('a', lambda r: 'abc'), mkref('b', lambda r: 'def')) == ('abc', 'def')
+ assert pair.get((), mkref('a', lambda r: 'abc'), mkref('b', lambda r: 'def')) == ('abc', 'def')
return True
def testLogic():
@@ -133,6 +134,7 @@ def testURL():
assert host.get((), mkprop('host', lambda: 'localhost')) == 'localhost'
assert path.get((), mkprop('path', lambda: ('abc', 'def'))) == ('abc', 'def')
assert params.get((), mkprop('params', lambda: (("'a", 'abc'), ("'d", 'def')))) == (("'a", 'abc'), ("'d", 'def'))
+ assert param.get((), mkref('n', lambda r: "'d"), mkprop('params', lambda: (("'a", 'abc'), ("'d", 'def'), ("'g", 'ghi')))) == 'def'
assert user.get((), mkprop('user', lambda: 'joe')) == 'joe'
assert realm.get((), mkprop('realm', lambda: 'localhost')) == 'localhost'
assert email.get((), mkprop('email', lambda: 'joe@localhost')) == 'joe@localhost'