diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-24 10:08:05 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-24 10:08:05 (GMT) |
commit | 2145de103988086a6a0e72890b1104cd9c4a843e (patch) | |
tree | cb91e7ad84c0f323e5d3073330d0fcb39dab0f22 | |
parent | c89de594d37e33cb484e3ced73ee1ffbb0c81851 (diff) |
Hook up get_from_file_name
-rw-r--r-- | sugar/objects/__init__.py | 3 | ||||
-rw-r--r-- | sugar/objects/mime.py | 12 | ||||
-rwxr-xr-x | tests/test-mime.py | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sugar/objects/__init__.py b/sugar/objects/__init__.py index 139597f..8f3e552 100644 --- a/sugar/objects/__init__.py +++ b/sugar/objects/__init__.py @@ -1,2 +1 @@ - - +from sugar.objects import mime diff --git a/sugar/objects/mime.py b/sugar/objects/mime.py index 9e40561..1ab1251 100644 --- a/sugar/objects/mime.py +++ b/sugar/objects/mime.py @@ -1,4 +1,8 @@ -from sugar import _sugarext - -def get_from_filename(filename): - return _sugarext.get_mime_type_from_filename(filename) +try: + from sugar import _sugarext +except ImportError: + from sugar import ltihooks + from sugar import _sugarext + +def get_from_file_name(file_name): + return _sugarext.get_mime_type_from_file_name(file_name) diff --git a/tests/test-mime.py b/tests/test-mime.py index 8ecd613..f9b3ac2 100755 --- a/tests/test-mime.py +++ b/tests/test-mime.py @@ -16,6 +16,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from sugar import objects +from sugar.objects import mime -print objects.mime.get_from_filename('test.pdf') +print mime.get_from_file_name('test.pdf') |