From a05e50d35689aca8e305c404a9facb4f4132b2e6 Mon Sep 17 00:00:00 2001 From: "NJ. Ouchn" Date: Fri, 16 Jun 2017 17:55:20 +0300 Subject: [PATCH 1/6] Delete dev071.iml --- .idea/dev071.iml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 .idea/dev071.iml diff --git a/.idea/dev071.iml b/.idea/dev071.iml deleted file mode 100755 index e123bc6..0000000 --- a/.idea/dev071.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From c294df36355fef0b874df7ab377338d6d918d0fe Mon Sep 17 00:00:00 2001 From: "NJ. Ouchn" Date: Fri, 16 Jun 2017 18:04:24 +0300 Subject: [PATCH 2/6] Update constants.py --- config/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/constants.py b/config/constants.py index 5445c2b..7f8097a 100644 --- a/config/constants.py +++ b/config/constants.py @@ -17,7 +17,7 @@ author = "vFeed IO" twitter = "@vfeed_io" repository = "https://vfeed.io" -build = "0.7.1" +build = "0.7.2" # Automated update Information dropbox_dl = " INSERT YOUR DB LINK HERE" From 30fd43ea77adbb4f3b9e070f4c5c654991fae86c Mon Sep 17 00:00:00 2001 From: Peter Clemenko Date: Mon, 26 Jun 2017 21:58:33 -0400 Subject: [PATCH 3/6] a few bugfixes that cause syntax errors --- lib/core/update.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/core/update.py b/lib/core/update.py index 8d70e33..913fc37 100755 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -7,7 +7,7 @@ import os import sys -import urllib2 +import urllib import tarfile from lib.common.utils import checksum @@ -89,7 +89,7 @@ def uncompress(self): try: self.tar = tarfile.open(self.db_compressed, 'r:gz') self.tar.extractall('.') - except Exception, e: + except Exception as e: print("[!] Database not extracted ", e) def check_status(self): @@ -122,7 +122,7 @@ def clean(self): os.remove(self.db_compressed) if os.path.isfile(self.db_update): os.remove(self.db_update) - except Exception, e: + except Exception as e: print("[+] Already cleaned", e) def check_drobpox_lnk(self): From 3fcb2a07cd514422dd852b3d878e50574ef78999 Mon Sep 17 00:00:00 2001 From: "NJ. Ouchn" Date: Tue, 25 Jul 2017 06:18:46 -0700 Subject: [PATCH 4/6] Update update.py --- lib/core/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/update.py b/lib/core/update.py index 913fc37..dff882a 100755 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -7,7 +7,7 @@ import os import sys -import urllib +import urllib2 import tarfile from lib.common.utils import checksum From 9ce6bc148bdb0ef92c630ade639de2bbace6532f Mon Sep 17 00:00:00 2001 From: BlackVirusScript Date: Sun, 30 Jul 2017 15:40:47 -0300 Subject: [PATCH 5/6] Update update.py Add compatibility with Python3 by importing the `urllib.request` module if importing `urllib2` fails. --- lib/core/update.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/core/update.py b/lib/core/update.py index dff882a..408a2b1 100755 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -7,7 +7,10 @@ import os import sys -import urllib2 +try: + import urllib2 +except ImportError: + import urllib.request as urllib2 import tarfile from lib.common.utils import checksum From ef9b11d2e71996e0a1411bbd36b4f30b60914d6e Mon Sep 17 00:00:00 2001 From: BlackVirusScript Date: Sat, 12 Aug 2017 12:17:53 -0300 Subject: [PATCH 6/6] Update update.py Fix incompatibility with python3 replacing the `getheaders` function with `get` ... --- lib/core/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/update.py b/lib/core/update.py index 408a2b1..b7b1bf9 100755 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -62,7 +62,7 @@ def download(self, url, filename): self.u = urllib2.urlopen(url) self.f = open(self.filename, 'wb') self.meta = self.u.info() - self.filesize = int(self.meta.getheaders("Content-Length")[0]) + self.filesize = int(self.meta.get("Content-Length")) self.filesize_dl = 0 self.block_sz = 8192 while True: