davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2e43fd3f1c049dc6e8a1274ed5b3d500020afa9a
commit 2e43fd3f1c049dc6e8a1274ed5b3d500020afa9a
Author: Dave Andreoli <d...@gurumeditation.it>
Date: Tue Feb 27 18:05:21 2018 +0100
Pyolian: rename path/filename retrieval APIs
---
src/scripts/pyolian/eolian.py | 16 ++++++++--------
src/scripts/pyolian/eolian_lib.py | 24 ++++++++++++------------
src/scripts/pyolian/test_eolian.py | 8 ++++----
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 9258e629f4..4ca53e375f 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -447,20 +447,20 @@ class Eolian(Eolian_Unit):
return Eolian_Unit(c_unit) if c_unit else None
@property
- def all_eo_file_paths(self):
- return Iterator(_str_to_py,
lib.eolian_all_eo_file_paths_get(self._obj))
+ def eo_file_paths(self):
+ return Iterator(_str_to_py,
lib.eolian_state_eo_file_paths_get(self._obj))
@property
- def all_eot_file_paths(self):
- return Iterator(_str_to_py,
lib.eolian_all_eot_file_paths_get(self._obj))
+ def eot_file_paths(self):
+ return Iterator(_str_to_py,
lib.eolian_state_eot_file_paths_get(self._obj))
@property
- def all_eo_files(self):
- return Iterator(_str_to_py, lib.eolian_all_eo_files_get(self._obj))
+ def eo_files(self):
+ return Iterator(_str_to_py, lib.eolian_state_eo_files_get(self._obj))
@property
- def all_eot_files(self):
- return Iterator(_str_to_py, lib.eolian_all_eot_files_get(self._obj))
+ def eot_files(self):
+ return Iterator(_str_to_py, lib.eolian_state_eot_files_get(self._obj))
def directory_add(self, dir_path):
return bool(lib.eolian_state_directory_add(self._obj,
_str_to_bytes(dir_path)))
diff --git a/src/scripts/pyolian/eolian_lib.py
b/src/scripts/pyolian/eolian_lib.py
index 436142c6fa..715e4cf83b 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -51,21 +51,21 @@ lib.eolian_state_free.restype = None
lib.eolian_file_parse.argtypes = [c_void_p, c_char_p]
lib.eolian_file_parse.restype = c_void_p
-# EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian_State *state);
-lib.eolian_all_eo_file_paths_get.argtypes = [c_void_p,]
-lib.eolian_all_eo_file_paths_get.restype = c_void_p
+# EAPI Eina_Iterator *eolian_state_eo_file_paths_get(const Eolian_State
*state);
+lib.eolian_state_eo_file_paths_get.argtypes = [c_void_p,]
+lib.eolian_state_eo_file_paths_get.restype = c_void_p
-# EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian_State *state);
-lib.eolian_all_eot_file_paths_get.argtypes = [c_void_p,]
-lib.eolian_all_eot_file_paths_get.restype = c_void_p
+# EAPI Eina_Iterator *eolian_state_eot_file_paths_get(const Eolian_State
*state);
+lib.eolian_state_eot_file_paths_get.argtypes = [c_void_p,]
+lib.eolian_state_eot_file_paths_get.restype = c_void_p
-# EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian_State *state);
-lib.eolian_all_eo_files_get.argtypes = [c_void_p,]
-lib.eolian_all_eo_files_get.restype = c_void_p
+# EAPI Eina_Iterator *eolian_state_eo_files_get(const Eolian_State *state);
+lib.eolian_state_eo_files_get.argtypes = [c_void_p,]
+lib.eolian_state_eo_files_get.restype = c_void_p
-# EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian_State *state);
-lib.eolian_all_eot_files_get.argtypes = [c_void_p,]
-lib.eolian_all_eot_files_get.restype = c_void_p
+# EAPI Eina_Iterator *eolian_state_eot_files_get(const Eolian_State *state);
+lib.eolian_state_eot_files_get.argtypes = [c_void_p,]
+lib.eolian_state_eot_files_get.restype = c_void_p
# EAPI Eina_Bool eolian_state_directory_add(Eolian_State *state, const char
*dir);
lib.eolian_state_directory_add.argtypes = [c_void_p, c_char_p]
diff --git a/src/scripts/pyolian/test_eolian.py
b/src/scripts/pyolian/test_eolian.py
index 59f949ca55..92ff1350a0 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -54,19 +54,19 @@ class TestBaseObject(unittest.TestCase):
class TestEolianUnit(unittest.TestCase):
def test_file_listing(self):
- l = list(eolian_db.all_eo_file_paths)
+ l = list(eolian_db.eo_file_paths)
self.assertGreater(len(l), 400)
self.assertTrue(l[0].endswith('.eo'))
- l = list(eolian_db.all_eo_files)
+ l = list(eolian_db.eo_files)
self.assertGreater(len(l), 400)
self.assertTrue(l[0].endswith('.eo'))
- l = list(eolian_db.all_eot_file_paths)
+ l = list(eolian_db.eot_file_paths)
self.assertGreater(len(l), 10)
self.assertTrue(l[0].endswith('.eot'))
- l = list(eolian_db.all_eot_files)
+ l = list(eolian_db.eot_files)
self.assertGreater(len(l), 10)
self.assertTrue(l[0].endswith('.eot'))
--
