| Index: trunk/testing/installer/installers.py |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | try: |
| 45 | 45 | ppath=parse_path(" ".join(args[1:])) |
| 46 | 46 | except Parse_Exception,e: |
| 47 | | - print e.message |
| | 47 | + print str(e) |
| 48 | 48 | return |
| 49 | 49 | |
| 50 | 50 | try: |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | elif ppath['ai']=='installed' or ppath['ai']==None: # XXX hardcoded default |
| 58 | 58 | output=ls_installed(ppath) |
| 59 | 59 | except Listing_Exception,e: |
| 60 | | - print e.message |
| | 60 | + print str(e) |
| 61 | 61 | return |
| 62 | 62 | |
| 63 | 63 | if output==None: |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | try: |
| 112 | 112 | installed=system.get_installed() |
| 113 | 113 | except Installer_Exception,e: |
| 114 | | - print e.message |
| | 114 | + print str(e) |
| 115 | 115 | return |
| 116 | 116 | |
| 117 | 117 | return installed |
| — | — | @@ -129,7 +129,7 @@ |
| 130 | 130 | try: |
| 131 | 131 | revisions=system.get_revisions(ppath["installer"]) |
| 132 | 132 | except Installer_Exception, e: |
| 133 | | - raise Listing_Exception(e.message) |
| | 133 | + raise Listing_Exception(str(e)) |
| 134 | 134 | |
| 135 | 135 | return revisions |
| 136 | 136 | |
| — | — | @@ -147,7 +147,7 @@ |
| 148 | 148 | try: |
| 149 | 149 | tags=system.get_tags(ppath["installer"]) |
| 150 | 150 | except TagsException, e: |
| 151 | | - raise Listing_Exception(e.message) |
| | 151 | + raise Listing_Exception(str(e)) |
| 152 | 152 | |
| 153 | 153 | return tags |
| 154 | 154 | |
| — | — | @@ -160,7 +160,7 @@ |
| 161 | 161 | try: |
| 162 | 162 | ppath=parse_path(" ".join(args[1:]),defaults={'ai':'available'}) |
| 163 | 163 | except Parse_Exception,e: |
| 164 | | - print e.message |
| | 164 | + print str(e) |
| 165 | 165 | return |
| 166 | 166 | |
| 167 | 167 | if not ppath["ai"]: |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | try: |
| 178 | 178 | mw.duplicate(args[1],args[2]) |
| 179 | 179 | except Mediawiki_Installer_Exception,e: |
| 180 | | - print e.message |
| | 180 | + print str(e) |
| 181 | 181 | |
| 182 | 182 | |
| 183 | 183 | def install(args): |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | try: |
| 191 | 191 | ppath=parse_path(" ".join(args[1:]), defaults={'ai':'available','system':'mediawiki'}) |
| 192 | 192 | except Parse_Exception,e: |
| 193 | | - print e.message |
| | 193 | + print str(e) |
| 194 | 194 | return |
| 195 | 195 | |
| 196 | 196 | if ppath["ai"]=="installed": |
| — | — | @@ -216,7 +216,7 @@ |
| 217 | 217 | print "Install failed." |
| 218 | 218 | |
| 219 | 219 | except Installer_Exception,e: |
| 220 | | - print e.message |
| | 220 | + print str(e) |
| 221 | 221 | |
| 222 | 222 | def test(args): |
| 223 | 223 | if len(args)<2: |
| — | — | @@ -243,7 +243,7 @@ |
| 244 | 244 | try: |
| 245 | 245 | ppath=parse_path(" ".join(args[1:]),defaults={'ai':'installed','system':'mediawiki'}) |
| 246 | 246 | except Parse_Exception,e: |
| 247 | | - print e.message |
| | 247 | + print str(e) |
| 248 | 248 | return |
| 249 | 249 | |
| 250 | 250 | if ppath["ai"]=="available": |
| — | — | @@ -262,7 +262,7 @@ |
| 263 | 263 | else: |
| 264 | 264 | print "Uninstall failed." |
| 265 | 265 | except Installer_Exception,e: |
| 266 | | - print e.message |
| | 266 | + print str(e) |
| 267 | 267 | return |
| 268 | 268 | |
| 269 | 269 | |