View | Details | Raw Unified | Return to bug 239106 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-102 / +58 lines)
Line 236 Link Here
236
        print >>sys.stderr, 'URE_BOOTSTRAP=%s' % os.environ['URE_BOOTSTRAP']
236
        print('URE_BOOTSTRAP=%s' % os.environ['URE_BOOTSTRAP'], file=sys.stderr)
237
--
Line 238 Link Here
238
        print >>sys.stderr, 'UNO_PATH=%s' % os.environ['UNO_PATH']
238
        print('UNO_PATH=%s' % os.environ['UNO_PATH'], file=sys.stderr)
239
--
Lines 240-241 Link Here
240
        print >>sys.stderr, 'UNO_TYPES=%s' % os.environ['UNO_TYPES']
240
        print('UNO_TYPES=%s' % os.environ['UNO_TYPES'], file=sys.stderr)
241
    print 'PATH=%s' % os.environ['PATH']
241
    print('PATH=%s' % os.environ['PATH'])
242
--
Line 243 Link Here
243
        print >>sys.stderr, 'PYTHONHOME=%s' % os.environ['PYTHONHOME']
243
        print('PYTHONHOME=%s' % os.environ['PYTHONHOME'], file=sys.stderr)
244
--
Line 245 Link Here
245
        print >>sys.stderr, 'PYTHONPATH=%s' % os.environ['PYTHONPATH']
245
        print('PYTHONPATH=%s' % os.environ['PYTHONPATH'], file=sys.stderr)
246
--
Line 247 Link Here
247
        print >>sys.stderr, 'LD_LIBRARY_PATH=%s' % os.environ['LD_LIBRARY_PATH']
247
        print('LD_LIBRARY_PATH=%s' % os.environ['LD_LIBRARY_PATH'], file=sys.stderr)
248
--
Line 338 Link Here
338
        print >>sys.stderr, "The following list of %s formats are currently available:\n" % doctype
338
        print("The following list of %s formats are currently available:\n" % doctype, file=sys.stderr)
339
--
Line 341 Link Here
341
                print >>sys.stderr, "  %-8s - %s" % (fmt.name, fmt)
341
                print("  %-8s - %s" % (fmt.name, fmt), file=sys.stderr)
342
--
Lines 533-534 Link Here
533
        except getopt.error, exc:
533
        except getopt.error as exc:
534
            print 'unoconv: %s, try unoconv -h for a list of all the options' % str(exc)
534
            print('unoconv: %s, try unoconv -h for a list of all the options' % str(exc))
535
--
Line 565 Link Here
565
                    print >>sys.stderr, 'Warning: Option %s cannot be parsed, ignoring.' % arg
565
                    print('Warning: Option %s cannot be parsed, ignoring.' % arg, file=sys.stderr)
566
--
Line 584 Link Here
584
                    print >>sys.stderr, 'Warning: Option %s cannot be parsed, ignoring.' % arg
584
                    print('Warning: Option %s cannot be parsed, ignoring.' % arg, file=sys.stderr)
585
--
Line 592 Link Here
592
                print >>sys.stderr, 'Warning: This option is deprecated by --output.'
592
                print('Warning: This option is deprecated by --output.', file=sys.stderr)
593
--
Line 618 Link Here
618
            print >>sys.stderr, 'Verbosity set to level %d' % self.verbose
618
            print('Verbosity set to level %d' % self.verbose, file=sys.stderr)
619
--
Lines 623-624 Link Here
623
            print >>sys.stderr, 'unoconv: you have to provide a filename as argument'
623
            print('unoconv: you have to provide a filename as argument', file=sys.stderr) 
624
            print >>sys.stderr, 'Try `unoconv -h\' for more information.'
624
            print('Try `unoconv -h\' for more information.', file=sys.stderr)
625
--
Lines 662-668 Link Here
662
        print 'unoconv %s' % VERSION
662
        print('unoconv %s' % VERSION)
663
        print 'Written by Dag Wieers <dag@wieers.com>'
663
        print('Written by Dag Wieers <dag@wieers.com>')
664
        print 'Homepage at http://dag.wieers.com/home-made/unoconv/'
664
        print('Homepage at http://dag.wieers.com/home-made/unoconv/')
665
        print
665
        print ('\n')
666
        print 'platform %s/%s' % (os.name, sys.platform)
666
        print('platform %s/%s' % (os.name, sys.platform))
667
        print 'python %s' % sys.version
667
        print('python %s' % sys.version)
668
        print product.ooName, product.ooSetupVersion
668
        print(product.ooName, product.ooSetupVersion)
669
--
Line 673 Link Here
673
        print >>sys.stderr, 'usage: unoconv [options] file [file2 ..]'
673
        print('usage: unoconv [options] file [file2 ..]', file=sys.stderr)
674
--
Line 676 Link Here
676
        print >>sys.stderr, '''Convert from and to any format supported by LibreOffice
676
        print('''Convert from and to any format supported by LibreOffice, file=sys.stderr)
677
--
Line 701 Link Here
701
'''
701
''')
702
--
Line 717 Link Here
717
        except NoConnectException, e:
717
        except NoConnectException as e:
718
--
Line 752 Link Here
752
            except Exception, e:
752
            except Exception as e:
753
--
Line 795 Link Here
795
    #       print >>sys.stderr, 'unoconv: format `%s\' is part of multiple doctypes %s, selecting `%s\'.' % (format, [fmt.doctype for fmt in outputfmt], outputfmt[0].doctype)
795
    #       print('unoconv: format `%s\' is part of multiple doctypes %s, selecting `%s\'.' % (format, [fmt.doctype for fmt in outputfmt], outputfmt[0].doctype), file=sys.stderr)
796
--
Line 802 Link Here
802
                print >>sys.stderr, 'unoconv: format [%s/%s] is not known to unoconv.' % (op.doctype, op.format)
802
                print('unoconv: format [%s/%s] is not known to unoconv.' % (op.doctype, op.format), file=sys.stderr)
803
--
Line 804 Link Here
804
                print >>sys.stderr, 'unoconv: format [%s] is not known to unoconv.' % op.format
804
                print('unoconv: format [%s] is not known to unoconv.' % op.format, file=sys.stderr)
805
--
Line 816 Link Here
816
            print >>sys.stderr, 'Input file:', inputfn
816
            print('Input file:', inputfn, file=sys.stderr)
817
--
Line 819 Link Here
819
            print >>sys.stderr, 'unoconv: file `%s\' does not exist.' % inputfn
819
            print('unoconv: file `%s\' does not exist.' % inputfn, file=sys.stderr)
820
--
Line 857 Link Here
857
                    print >>sys.stderr, 'unoconv: template file `%s\' does not exist.' % op.template
857
                    print('unoconv: template file `%s\' does not exist.' % op.template, file=sys.stderr)
858
--
Line 927 Link Here
927
            except IOException, e:
927
            except IOException as e:
928
--
Line 934 Link Here
934
        except SystemError, e:
934
        except SystemError as e:
935
--
Line 938 Link Here
938
        except RuntimeException, e:
938
        except RuntimeException as e:
939
--
Line 942 Link Here
942
        except DisposedException, e:
942
        except DisposedException as e:
943
--
Line 946 Link Here
946
        except IllegalArgumentException, e:
946
        except IllegalArgumentException as e:
947
--
Lines 950-951 Link Here
950
        except IOException, e:
950
        except IOException as e:
951
#            for attr in dir(e): print '%s: %s', (attr, getattr(e, attr))
951
#            for attr in dir(e): print('%s: %s', (attr, getattr(e, attr)))
952
--
Lines 955-956 Link Here
955
        except CannotConvertException, e:
955
        except CannotConvertException as e:
956
#            for attr in dir(e): print '%s: %s', (attr, getattr(e, attr))
956
#            for attr in dir(e): print('%s: %s', (attr, getattr(e, attr)))
957
--
Line 960 Link Here
960
        except UnoException, e:
960
        except UnoException as e:
961
--
Line 985 Link Here
985
            except NoConnectException, e:
985
            except NoConnectException as e:
986
--
Line 994 Link Here
994
        except Exception, e:
994
        except Exception as e:
995
--
Line 1001 Link Here
1001
    print >>sys.stderr, msg
1001
    print(msg, file=sys.stderr)
1002
--
Line 1008 Link Here
1008
        print >>sys.stderr, "DEBUG:", msg
1008
        print("DEBUG:", msg, file=sys.stderr)
1009
--
Line 1012 Link Here
1012
        print >>sys.stderr, msg
1012
        print(msg, file=sys.stderr)
1013
--
Line 1034 Link Here
1034
            except Exception, e:
1034
            except Exception as e:
1035
--
Line 1083 Link Here
1083
    except NoConnectException, e:
1083
    except NoConnectException as e:
1084
--
Lines 1113-1114 Link Here
1113
            print >>sys.stderr, "unoconv: Cannot find a suitable pyuno library and python binary combination in %s" % of
1113
            print("unoconv: Cannot find a suitable pyuno library and python binary combination in %s" % of, file=sys.stderr)
1114
            print >>sys.stderr, "ERROR:", sys.exc_info()[1]
1114
            print("ERROR:", sys.exc_info()[1], file=sys.stderr)
1115
--
Lines 1118-1120 Link Here
1118
        print >>sys.stderr, "unoconv: Cannot find a suitable office installation on your system."
1118
        print("unoconv: Cannot find a suitable office installation on your system.", file=sys.stderr)
1119
        print >>sys.stderr, "ERROR: Please locate your office installation and send your feedback to:"
1119
        print("ERROR: Please locate your office installation and send your feedback to:", file=sys.stderr)
1120
        print >>sys.stderr, "       http://github.com/dagwieers/unoconv/issues"
1120
        print("       http://github.com/dagwieers/unoconv/issues", file=sys.stderr)
1121
--
Line 1163 Link Here
1163
    except KeyboardInterrupt, e:
1163
    except KeyboardInterrupt as e:
1164
--

Return to bug 239106