UriValue -> AnyUri.Value

plq · plq · commit 936cfe1794a2 · 2012-08-28T04:31:51.000+03:00
diff --git a/spyne/model/primitive.py b/spyne/model/primitive.py
@@ -227,7 +227,7 @@ class Attributes(String.Attributes):
         text = None
         """The text shown in link. This is an object-wide constant."""
 
-    class UriValue(object):
+    class Value(object):
         """A special object that is just a better way of carrying the
         information carried with a link.
 
diff --git a/spyne/test/protocol/test_html_table.py b/spyne/test/protocol/test_html_table.py
@@ -32,7 +32,6 @@
 from spyne.model.primitive import Integer
 from spyne.model.primitive import String
 from spyne.model.primitive import AnyUri
-from spyne.model.primitive import UriValue
 from spyne.model.complex import Array
 from spyne.model.complex import ComplexModel
 from spyne.protocol.http import HttpRpc
@@ -172,7 +171,7 @@ class C(ComplexModel):
         class SomeService(ServiceBase):
             @srpc(_returns=Array(C))
             def some_call():
-                return [C(c=UriValue(_link, text=_text))]
+                return [C(c=AnyUri.Value(_link, text=_text))]
 
         app = Application([SomeService], 'tns', in_protocol=HttpRpc(),
                  out_protocol=HtmlTable(field_name_attr='class'))
@@ -220,7 +219,7 @@ class C(ComplexModel):
         class SomeService(ServiceBase):
             @srpc(_returns=C)
             def some_call():
-                return C(c=UriValue(_link, text=_text))
+                return C(c=AnyUri.Value(_link, text=_text))
 
         app = Application([SomeService], 'tns', in_protocol=HttpRpc(),
                  out_protocol=HtmlTable(field_name_attr='class', fields_as='rows'))
