master
David John 7 years ago
commit f4a5b67ceb

@ -1,3 +1,4 @@
<<<<<<< HEAD
arrow==0.9.0 arrow==0.9.0
decorator==4.0.10 decorator==4.0.10
praw==4.2.0 praw==4.2.0
@ -9,3 +10,21 @@ tornado==4.3
update-checker==0.15 update-checker==0.15
wheel==0.24.0 wheel==0.24.0
appdirs==1.4.3 appdirs==1.4.3
=======
appdirs==1.4.3
arrow==0.10.0
backports-abc==0.5
certifi==2017.4.17
chardet==3.0.4
idna==2.5
praw==5.0.0
prawcore==0.11.0
python-dateutil==2.6.0
PyYAML==3.12
requests==2.18.1
shreddit==6.0.7
six==1.10.0
tornado==4.5.1
update-checker==0.16
urllib3==1.21.1
>>>>>>> 772df35c68a6782b2bd733801458023545977166

@ -130,11 +130,12 @@ class Shredder(object):
def _remove(self, item): def _remove(self, item):
if self._keep_a_copy and self._save_directory: if self._keep_a_copy and self._save_directory:
self._save_item(item) self._save_item(item)
if self._clear_vote: if not self._trial_run:
try: if self._clear_vote:
item.clear_vote() try:
except BadRequest: item.clear_vote()
self._logger.debug("Couldn't clear vote on {item}".format(item=item)) except BadRequest:
self._logger.debug("Couldn't clear vote on {item}".format(item=item))
if isinstance(item, Submission): if isinstance(item, Submission):
self._remove_submission(item) self._remove_submission(item)
elif isinstance(item, Comment): elif isinstance(item, Comment):

Loading…
Cancel
Save