kuuko pushed a commit to branch master.
commit 48edc6d73d41aaf4f335055ca7c7168ce49ee174
Author: Kai Huuhko <[email protected]>
Date: Tue Apr 2 17:37:06 2013 +0000
Elm: Fix tests to work in py3
---
examples/elementary/test_calendar.py | 4 ++--
examples/elementary/test_gengrid.py | 2 +-
examples/elementary/test_genlist.py | 4 +++-
examples/elementary/test_map2.py | 10 +++++-----
examples/elementary/test_multibuttonentry.py | 8 ++++----
examples/elementary/test_segment_control.py | 10 +++++-----
6 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/examples/elementary/test_calendar.py
b/examples/elementary/test_calendar.py
index 8fc1884..cebc4f0 100644
--- a/examples/elementary/test_calendar.py
+++ b/examples/elementary/test_calendar.py
@@ -50,12 +50,12 @@ def set_api_state(api):
cal.selected_time = the_time
elif api["state"] == STATE_SELECT_DATE_DISABLED_WITH_MARKS:
cal = items[0]
- the_time = datetime(2011, 01, 01)
+ the_time = datetime(2011, 1, 1)
cal.select_mode = elementary.ELM_CALENDAR_SELECT_MODE_NONE
cal.selected_time = the_time
elif api["state"] == STATE_SELECT_DATE_DISABLED_NO_MARKS:
cal = items[0]
- the_time = datetime(2011, 02, 01)
+ the_time = datetime(2011, 2, 1)
del cal.marks
cal.select_mode = elementary.ELM_CALENDAR_SELECT_MODE_NONE
cal.selected_time = the_time
diff --git a/examples/elementary/test_gengrid.py
b/examples/elementary/test_gengrid.py
index 9788534..4afb2e9 100644
--- a/examples/elementary/test_gengrid.py
+++ b/examples/elementary/test_gengrid.py
@@ -388,7 +388,7 @@ def gengrid_clicked(obj):
tb.pack(bt, 4, 5, 1, 1)
bt.show()
- print gg
+ print(gg)
win.resize(480, 800)
win.show()
diff --git a/examples/elementary/test_genlist.py
b/examples/elementary/test_genlist.py
index 88a20d0..feb8406 100644
--- a/examples/elementary/test_genlist.py
+++ b/examples/elementary/test_genlist.py
@@ -2,6 +2,8 @@
# encoding: utf-8
import time
+import sys
+if sys.version_info < (3,): range = xrange
from efl import evas
from efl import ecore
@@ -469,7 +471,7 @@ def genlist5_clicked(obj, item=None):
item_count = 10000
t1 = time.time()
- for i in xrange(item_count):
+ for i in range(item_count):
GenlistItem(itc_i, None, 0, None, i).append_to(gl)
t2 = time.time()
diff --git a/examples/elementary/test_map2.py b/examples/elementary/test_map2.py
index 7796dca..32624ee 100644
--- a/examples/elementary/test_map2.py
+++ b/examples/elementary/test_map2.py
@@ -39,14 +39,14 @@ from efl.elementary.map import Map
def cb_btn_clear_overlays(bt, Map):
for ov in Map.overlays:
- print ov, ov.type
+ print(ov, ov.type)
if (ov.type != elementary.ELM_MAP_OVERLAY_TYPE_CLASS):
ov.delete()
def cb_btn_ungroup_overlays(bt, Map):
for ov in Map.overlays:
if isinstance(ov, MapOverlayClass):
- print ov
+ print(ov)
# TODO ungroup instead
for ov2 in ov.members:
ov.delete()
@@ -144,9 +144,9 @@ def cb_ctx_overlay_scale(li, item, Map, x, y):
Map.overlay_scale_add(x, y)
def test(li, item, Map, lon, lat):
- print li
- print item
- print Map
+ print(li)
+ print(item)
+ print(Map)
# ctx.dismiss()
ov = Map.overlay_add(lon, lat)
diff --git a/examples/elementary/test_multibuttonentry.py
b/examples/elementary/test_multibuttonentry.py
index efaa3a7..73a812e 100644
--- a/examples/elementary/test_multibuttonentry.py
+++ b/examples/elementary/test_multibuttonentry.py
@@ -15,9 +15,9 @@ from efl.elementary.scroller import Scroller
counter = 0
def cb_item_selected(mbe, item):
- print "cb!!!!!!!!!!!" # TODO this is never called
- print mbe
- print item
+ print("cb!!!!!!!!!!!") # TODO this is never called
+ print(mbe)
+ print(item)
def cb_btn_item_prepend(btn, mbe):
global counter
@@ -86,7 +86,7 @@ def multibuttonentry_clicked(obj, item=None):
sc.content = mbe
mbe.show()
- print mbe.entry
+ print(mbe.entry)
hbox = Box(win)
hbox.horizontal = True
diff --git a/examples/elementary/test_segment_control.py
b/examples/elementary/test_segment_control.py
index 3c60ddf..51b247f 100644
--- a/examples/elementary/test_segment_control.py
+++ b/examples/elementary/test_segment_control.py
@@ -11,9 +11,9 @@ from efl.elementary.segment_control import SegmentControl
def cb_seg_changed(seg, item):
- print seg
- print item
-
+ print(seg)
+ print(item)
+
def segment_control_clicked(obj):
win = Window("segment-control", elementary.ELM_WIN_BASIC)
win.title_set("Segment Control test")
@@ -60,7 +60,7 @@ def segment_control_clicked(obj):
seg.item_add(None, "SegmentItem")
seg.item_add(None, "SegmentItem")
- print it
+ print(it)
# it.selected_set(True)
vbox.pack_end(seg)
seg.show()
@@ -84,7 +84,7 @@ def segment_control_clicked(obj):
# segment 4
seg = SegmentControl(win)
-
+
seg.size_hint_weight = (evas.EVAS_HINT_EXPAND, evas.EVAS_HINT_EXPAND)
seg.size_hint_align = (evas.EVAS_HINT_FILL, 0.5)
--
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
