1 diff -ruN trash-cli-0.11.3-r315/ez_setup.py trash-cli-0.11.3-r315_fixed//ez_setup.py
2 --- trash-cli-0.11.3-r315/ez_setup.py 2009-10-20 12:08:08.000000000 -0200
3 +++ trash-cli-0.11.3-r315_fixed//ez_setup.py 2010-10-18 19:32:55.367816394 -0200
7 """Bootstrap setuptools installation
9 If you want to use setuptools in your package's setup.py, just include this
10 diff -ruN trash-cli-0.11.3-r315/google-code/googlecode_upload.py trash-cli-0.11.3-r315_fixed//google-code/googlecode_upload.py
11 --- trash-cli-0.11.3-r315/google-code/googlecode_upload.py 2010-06-01 16:44:56.000000000 -0300
12 +++ trash-cli-0.11.3-r315_fixed//google-code/googlecode_upload.py 2010-10-18 19:32:55.364480128 -0200
14 -#!/usr/bin/env python
15 +#!/usr/bin/env python2
17 # Copyright 2006, 2007 Google Inc. All Rights Reserved.
18 # Author: danderson@google.com (David Anderson)
19 diff -ruN trash-cli-0.11.3-r315/setup.py trash-cli-0.11.3-r315_fixed//setup.py
20 --- trash-cli-0.11.3-r315/setup.py 2010-08-15 17:25:00.000000000 -0300
21 +++ trash-cli-0.11.3-r315_fixed//setup.py 2010-10-18 19:32:55.364480128 -0200
23 -#!/usr/bin/env python
24 +#!/usr/bin/env python2
25 # setup.py: Python distutils script
27 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
28 diff -ruN trash-cli-0.11.3-r315/tests/cli/test_restore.py trash-cli-0.11.3-r315_fixed//tests/cli/test_restore.py
29 --- trash-cli-0.11.3-r315/tests/cli/test_restore.py 2010-06-01 16:44:49.000000000 -0300
30 +++ trash-cli-0.11.3-r315_fixed//tests/cli/test_restore.py 2010-10-18 19:32:55.374482152 -0200
34 # tests/cli/test_restore.py: Unit tests for trashcli.cli.restore classes.
36 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
37 diff -ruN trash-cli-0.11.3-r315/tests/cli/test_subcommandsparser.py trash-cli-0.11.3-r315_fixed//tests/cli/test_subcommandsparser.py
38 --- trash-cli-0.11.3-r315/tests/cli/test_subcommandsparser.py 2010-06-01 16:44:49.000000000 -0300
39 +++ trash-cli-0.11.3-r315_fixed//tests/cli/test_subcommandsparser.py 2010-10-18 19:32:55.374482152 -0200
43 # tests/cli/test_subcommandsparser.py: Unit tests for trashcli.cli.subcommandsparser
45 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
46 diff -ruN trash-cli-0.11.3-r315/tests/command_tests/test_empty.py trash-cli-0.11.3-r315_fixed//tests/command_tests/test_empty.py
47 --- trash-cli-0.11.3-r315/tests/command_tests/test_empty.py 2010-06-01 16:44:48.000000000 -0300
48 +++ trash-cli-0.11.3-r315_fixed//tests/command_tests/test_empty.py 2010-10-18 19:32:55.374482152 -0200
53 # tests/command_tests/test_empty.py: Tests for the trash-empty command.
55 diff -ruN trash-cli-0.11.3-r315/tests/command_tests/test_list.py trash-cli-0.11.3-r315_fixed//tests/command_tests/test_list.py
56 --- trash-cli-0.11.3-r315/tests/command_tests/test_list.py 2010-06-01 16:44:48.000000000 -0300
57 +++ trash-cli-0.11.3-r315_fixed//tests/command_tests/test_list.py 2010-10-18 19:32:55.374482152 -0200
61 # tests/command_tests/test_list.py: Tests for the trash-list command.
63 # Copyright (C) 2009 Andrea Francia Trivolzio(PV) Italy
64 diff -ruN trash-cli-0.11.3-r315/tests/test_trash.py trash-cli-0.11.3-r315_fixed//tests/test_trash.py
65 --- trash-cli-0.11.3-r315/tests/test_trash.py 2010-06-01 16:44:49.000000000 -0300
66 +++ trash-cli-0.11.3-r315_fixed//tests/test_trash.py 2010-10-18 19:32:55.374482152 -0200
70 # tests/test_trash.py: Unit tests for trashcli.trash module.
72 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
73 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/admin.py trash-cli-0.11.3-r315_fixed//trashcli/cli/admin.py
74 --- trash-cli-0.11.3-r315/trashcli/cli/admin.py 2010-08-15 12:13:48.000000000 -0300
75 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/admin.py 2010-10-18 19:32:55.367816394 -0200
79 # trashcan-admin: administer the trashcan
81 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
82 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/empty.py trash-cli-0.11.3-r315_fixed//trashcli/cli/empty.py
83 --- trash-cli-0.11.3-r315/trashcli/cli/empty.py 2010-06-01 16:44:49.000000000 -0300
84 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/empty.py 2010-10-18 19:32:55.367816394 -0200
88 # trash-empty: remove file from trashcans
90 # Copyright (C) 2008 Einar Orn Olason
91 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/legacy_restore.py trash-cli-0.11.3-r315_fixed//trashcli/cli/legacy_restore.py
92 --- trash-cli-0.11.3-r315/trashcli/cli/legacy_restore.py 2010-08-15 12:57:58.000000000 -0300
93 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/legacy_restore.py 2010-10-18 19:32:55.367816394 -0200
97 # restore-trash: restore trashed file from the trashcan
99 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
100 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/list.py trash-cli-0.11.3-r315_fixed//trashcli/cli/list.py
101 --- trash-cli-0.11.3-r315/trashcli/cli/list.py 2010-06-01 16:44:49.000000000 -0300
102 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/list.py 2010-10-18 19:32:55.367816394 -0200
106 # trash-list: list trashed files
108 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
109 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/put.py trash-cli-0.11.3-r315_fixed//trashcli/cli/put.py
110 --- trash-cli-0.11.3-r315/trashcli/cli/put.py 2010-08-15 12:51:47.000000000 -0300
111 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/put.py 2010-10-18 19:32:55.367816394 -0200
115 # trash-put: put files and dirs in the trashcan
117 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
118 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/subcommandsparser.py trash-cli-0.11.3-r315_fixed//trashcli/cli/subcommandsparser.py
119 --- trash-cli-0.11.3-r315/trashcli/cli/subcommandsparser.py 2010-06-01 16:44:49.000000000 -0300
120 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/subcommandsparser.py 2010-10-18 19:32:55.367816394 -0200
124 # trashcan-admin: administer the trashcan
126 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
127 diff -ruN trash-cli-0.11.3-r315/trashcli/cli/volume_of.py trash-cli-0.11.3-r315_fixed//trashcli/cli/volume_of.py
128 --- trash-cli-0.11.3-r315/trashcli/cli/volume_of.py 2010-06-01 16:44:49.000000000 -0300
129 +++ trash-cli-0.11.3-r315_fixed//trashcli/cli/volume_of.py 2010-10-18 19:32:55.367816394 -0200
133 # volume-of: determine the volume of a file
135 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy
136 diff -ruN trash-cli-0.11.3-r315/trashcli/trash.py trash-cli-0.11.3-r315_fixed//trashcli/trash.py
137 --- trash-cli-0.11.3-r315/trashcli/trash.py 2010-08-15 15:04:46.000000000 -0300
138 +++ trash-cli-0.11.3-r315_fixed//trashcli/trash.py 2010-10-18 19:32:55.371148540 -0200
142 # trashcli/trash.py: library supporting FreeDesktop.org Trash Spec
144 # Copyright (C) 2007-2009 Andrea Francia Trivolzio(PV) Italy