From 7ab16b360739c4754c954ceb54b226ab0a30c215 Mon Sep 17 00:00:00 2001
From: Nitzo <nitzo2001@yahoo.com>
Date: Sat, 2 Jan 2016 01:37:43 +0200
Subject: "is" is evil
---
module/plugins/hooks/AntiVirus.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'module/plugins/hooks/AntiVirus.py')
diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index 1a0f3f8bd..bafd3f4d3 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -16,7 +16,7 @@ from module.plugins.internal.misc import encode, exists, fsjoin
class AntiVirus(Addon):
__name__ = "AntiVirus"
__type__ = "hook"
- __version__ = "0.16"
+ __version__ = "0.18"
__status__ = "broken"
#@TODO: add trash option (use Send2Trash lib)
@@ -44,7 +44,7 @@ class AntiVirus(Addon):
if not os.path.isfile(avfile):
self.fail(_("Antivirus executable not found"))
- scanfolder = self.config.get('avtarget') is "folder"
+ scanfolder = self.config.get('avtarget') == "folder"
if scanfolder:
dl_folder = self.pyload.config.get("general", "download_folder")
@@ -83,14 +83,14 @@ class AntiVirus(Addon):
action = self.config.get('action')
if scanfolder:
- if action is "Antivirus default":
+ if action == "Antivirus default":
self.log_warning(_("Delete/Quarantine task skipped in folder scan mode"))
return
pyfile.error = _("Infected file")
try:
- if action is "Delete":
+ if action == "Delete":
if not self.config.get('deltotrash'):
os.remove(file)
@@ -111,7 +111,7 @@ class AntiVirus(Addon):
else:
self.log_debug("Successfully moved file to trash")
- elif action is "Quarantine":
+ elif action == "Quarantine":
pyfile.setCustomStatus(_("file moving"))
shutil.move(file, self.config.get('quardir'))
@@ -132,5 +132,5 @@ class AntiVirus(Addon):
def download_failed(self, pyfile):
#: Check if pyfile is still "failed", maybe might has been restarted in meantime
- if pyfile.status is 8 and self.config.get('scanfailed'):
+ if pyfile.status == 8 and self.config.get('scanfailed'):
return self.scan(pyfile)
--
cgit v1.2.3