kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=5543852d5492a8a15c35fe1790f34f116b3af684

commit 5543852d5492a8a15c35fe1790f34f116b3af684
Author: Kai Huuhko <[email protected]>
Date:   Sat Sep 13 18:16:17 2014 +0300

    Examples: Add description to elm web exceptions, trivial updates to test
---
 efl/elementary/web.pyx          | 18 +++++++++---------
 examples/elementary/test_web.py | 13 ++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/efl/elementary/web.pyx b/efl/elementary/web.pyx
index c33b677..16ff955 100644
--- a/efl/elementary/web.pyx
+++ b/efl/elementary/web.pyx
@@ -508,7 +508,7 @@ cdef class Web(Object):
         def __set__(self, url):
             if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url)
             if not elm_web_url_set(self.obj, url):
-                raise RuntimeWarning
+                raise RuntimeWarning("Cannot set url")
 
         def __get__(self):
             return _ctouni(elm_web_url_get(self.obj))
@@ -516,7 +516,7 @@ cdef class Web(Object):
     def url_set(self, url):
         if isinstance(url, unicode): url = PyUnicode_AsUTF8String(url)
         if not elm_web_url_set(self.obj, url):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot set url")
 
     def url_get(self):
         return _ctouni(elm_web_url_get(self.obj))
@@ -670,7 +670,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_text_matches_unmark_all(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot clear marked matches")
 
     property text_matches_highlight:
         """
@@ -685,7 +685,7 @@ cdef class Web(Object):
         """
         def __set__(self, bint highlight):
             if not elm_web_text_matches_highlight_set(self.obj, highlight):
-                raise RuntimeWarning
+                raise RuntimeWarning("Cannot set matched marks highlighting")
 
         def __get__(self):
             return bool(elm_web_text_matches_highlight_get(self.obj))
@@ -719,7 +719,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_stop(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot stop")
 
     def reload(self):
         """
@@ -730,7 +730,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_reload(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot reload")
 
     def reload_full(self):
         """
@@ -741,7 +741,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_reload_full(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot reload without caches")
 
     def back(self):
         """
@@ -759,7 +759,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_back(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot go back")
 
     def forward(self):
         """
@@ -777,7 +777,7 @@ cdef class Web(Object):
 
         """
         if not elm_web_forward(self.obj):
-            raise RuntimeWarning
+            raise RuntimeWarning("Cannot go forward")
 
     def navigate(self, int steps):
         """
diff --git a/examples/elementary/test_web.py b/examples/elementary/test_web.py
index 5c220fe..98ec635 100644
--- a/examples/elementary/test_web.py
+++ b/examples/elementary/test_web.py
@@ -2,7 +2,6 @@
 # encoding: utf-8
 
 from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL
-from efl import ecore
 from efl import elementary
 from efl.elementary.window import StandardWindow
 from efl.elementary.box import Box
@@ -133,14 +132,14 @@ def web_clicked(obj):
     en.show()
 
     # Sync navigation entry and current URI
-    def do_change_uri(en):
-        web.uri = en.entry
+    def do_change_url(en):
+        web.url = en.entry
 
-    def did_change_uri(web, uri, en):
-        en.entry = uri
+    def did_change_url(web, url, en):
+        en.entry = url
 
-    en.callback_activated_add(do_change_uri)
-    web.callback_uri_changed_add(did_change_uri, en)
+    en.callback_activated_add(do_change_url)
+    web.callback_url_changed_add(did_change_url, en)
 
     # Sync title
     def did_change_title(web, title, win):

-- 


Reply via email to