Repository: andreafrancia/trash-cli (language: python)

Issue:
Minor cleanup



Discussion / hints:
Thank you for your contribution!
The commit about the spelling is great and I have already included it.
I don't think I need the others commits.
I think that bash is always on /bin/bash on the supported platforms so I don't think I need to include this commit.
I don't know yet what to do with the license.
I prefer not to include commits that changes only the white spaces.

Thank you for the review comments.

A few comments to explain:

I included the bash commit because bash doesn't exist on /bin/bash on any of my systems. /bin/bash is a symlink to /usr/bin/bash here, and it is always nice to look up the correct bash to use in case the user has a newer bash installed in /usr/local/bin/bash or some other virtual environment.

If you wish, I can rework the whitespace fixing commit to only deal with missing final newlines (strictly speaking fixing a violation of posix definition of what a line is), making sure to use unix newlines, not windows newlines, and dropping the trailing whitespace fixes.

Regarding the licenses changes, it is nice to distribute the same license as what gnu.org is distributing. The license version stays the same. It is only changing the physical addresses of FSF in case someone wished to send some post there, updates some formatting deviations and correctly refers to LGPL as 'Lesser' and not 'Library'. No contributor needs to be contacted in order to make these changes to the license.

Fix patch:
diff --git a/docs/some-output-of-df-command-on-different-systems.txt b/docs/some-output-of-df-command-on-different-systems.txt
index 45bf59da..ae78cfa5 100644
--- a/docs/some-output-of-df-command-on-different-systems.txt
+++ b/docs/some-output-of-df-command-on-different-systems.txt
@@ -57,4 +57,4 @@ lrm                    3062924     43040   3019884       2% /lib/modules/2.6.24-
 /dev/sda4            240686472  27295300 213391172      12% /media/archivio
 /dev/mapper/ibox      18929088  15733744   3195344      84% /media/ibox
 gvfs-fuse-daemon      10883628   5202528   5681100      48% /home/lem/.gvfs
-}}}
\ No newline at end of file
+}}}
diff --git a/requirements.txt b/requirements.txt
index 0b574b52..a4d92cc0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,1 +1,1 @@
-psutil
\ No newline at end of file
+psutil
diff --git a/setup.cfg b/setup.cfg
old mode 100755
new mode 100644
diff --git a/trashcli/__init__.py b/trashcli/__init__.py
index cc29a443..b08a9cf5 100644
--- a/trashcli/__init__.py
+++ b/trashcli/__init__.py
@@ -1,3 +1,3 @@
 import os
 
-base_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), ".."))
\ No newline at end of file
+base_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), ".."))


Test patch:
diff --git a/tests/empty/test_make_parser.py b/tests/empty/test_make_parser.py
index 5715158d..7f074e73 100644
--- a/tests/empty/test_make_parser.py
+++ b/tests/empty/test_make_parser.py
@@ -26,4 +26,4 @@ def test_interactive_default_is_interactive(self):
     def test_interactive_made_non_interactive(self):
         parsed = self.parser_interactive.parse_args(['-f'])
 
-        assert parsed.interactive == False
\ No newline at end of file
+        assert parsed.interactive == False
diff --git a/tests/list/test_file_size.py b/tests/list/test_file_size.py
index a4400404..0231852c 100644
--- a/tests/list/test_file_size.py
+++ b/tests/list/test_file_size.py
@@ -15,4 +15,4 @@ def test(self):
         assert 3 == result
 
     def tearDown(self):
-        self.tmp_dir.clean_up()
\ No newline at end of file
+        self.tmp_dir.clean_up()
diff --git a/tests/put/test_user.py b/tests/put/test_user.py
index 80914a6d..476782bc 100644
--- a/tests/put/test_user.py
+++ b/tests/put/test_user.py
@@ -21,4 +21,4 @@ def test_y(self): assert parse_user_reply('y') == user_replied_yes
     def test_Y(self): assert parse_user_reply('Y') == user_replied_yes
     def test_n(self): assert parse_user_reply('n') == user_replied_no
     def test_N(self): assert parse_user_reply('N') == user_replied_no
-    def test_other(self): assert parse_user_reply('other') == user_replied_no
\ No newline at end of file
+    def test_other(self): assert parse_user_reply('other') == user_replied_no
diff --git a/tests/test_file_descriptions.py b/tests/test_file_descriptions.py
index b8f1a29e..566ca28b 100644
--- a/tests/test_file_descriptions.py
+++ b/tests/test_file_descriptions.py
@@ -57,4 +57,4 @@ def test_name_for_non_existent_entries(self):
         assert "non existent" == describe(self.temp_dir / 'non-existent')
 
     def tearDown(self):
-        self.temp_dir.clean_up()
\ No newline at end of file
+        self.temp_dir.clean_up()
diff --git a/tests/test_trash_list.py b/tests/test_trash_list.py
index ab23a362..ffd791bb 100644
--- a/tests/test_trash_list.py
+++ b/tests/test_trash_list.py
@@ -50,12 +50,12 @@ def test_should_output_nothing_when_trashcan_is_empty(self):
         assert_equals_with_unidiff('', self.user.output())
 
     def test_should_output_deletion_date_and_path(self):
-        self.user.home_trashdir.add_trashinfo2('/aboslute/path',
+        self.user.home_trashdir.add_trashinfo2('/absolute/path',
                                                datetime(2001, 2, 3, 23, 55, 59))
 
         self.user.run_trash_list()
 
-        assert_equals_with_unidiff("2001-02-03 23:55:59 /aboslute/path\n",
+        assert_equals_with_unidiff("2001-02-03 23:55:59 /absolute/path\n",
                                    self.user.output())
 
     def test_should_output_info_for_multiple_files(self):