--- a/src/modules/client/image.py	Mon Sep 29 10:20:43 2008 -0500
+++ b/src/modules/client/image.py	Tue Sep 23 08:07:22 2008 -0500
@@ -1482,11 +1482,11 @@
 
                 myfmri = inputfmri
 
-                if isinstance(myfmri, str):
+                try:
+                        name = myfmri.get_name()
+                except AttributeError:
                         name = pkg.fmri.extract_pkg_name(myfmri)
                         myfmri = self.strtomatchingfmri(myfmri)
-                else:
-                        name = myfmri.get_name()
 
                 try:
                         myfmri = self.inventory([ myfmri ], all_known = True,
@@ -1513,11 +1513,11 @@
                 Doesn't handle catalog renames... to ease programming for now,
                 unversioned fmris are returned upgraded"""
 
-                if isinstance(myfmri, str):
+                try:
+                        name = myfmri.get_name()
+                except AttributeError:
                         name = pkg.fmri.extract_pkg_name(myfmri)
                         myfmri = self.strtomatchingfmri(myfmri)
-                else:
-                        name = myfmri.get_name()
 
                 minfmri = self.optional_dependencies.get(name, None)
                 if not minfmri: