Merge branch 'master' into master

Redshoee · Jun 1, 2017 · dd79eb1 · dd79eb1
2 parents 1d73f36 + 629efbb
commit dd79eb1
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.pyc
diff --git a/core/__init__.pyc b/core/__init__.pyc
diff --git a/core/lib/__init__.pyc b/core/lib/__init__.pyc
diff --git a/core/lib/wp_banner.pyc b/core/lib/wp_banner.pyc
diff --git a/core/lib/wp_checker.pyc b/core/lib/wp_checker.pyc
diff --git a/core/lib/wp_colors.pyc b/core/lib/wp_colors.pyc
diff --git a/core/lib/wp_info.pyc b/core/lib/wp_info.pyc
diff --git a/core/lib/wp_print.py b/core/lib/wp_print.py
@@ -19,21 +19,21 @@ class WPPrint:
 
  	def aprint(self,string,flag="##"):
 		# flag = green 
-		print "{}{}{} {}{}{}".format(self.g,str(flag),self.e,self.nw,str(string),self.e)
+		print u"{}{}{} {}{}{}".format(self.g,flag,self.e,self.nw,string,self.e)
 
 	def bprint(self,string,flag="##"):
 		# flag = red
-		print "{}{}{} {}{}{}".format(self.r,str(flag),self.e,self.nw,str(string),self.e)
+		print u"{}{}{} {}{}{}".format(self.r,flag,self.e,self.nw,string,self.e)
 
 	def cprint(self,string,flag="##"):
 		# flag = yellow
-		print "{}{}{} {}{}{}".format(self.y,str(flag),self.e,self.nw,str(string),self.e)
+		print u"{}{}{} {}{}{}".format(self.y,flag,self.e,self.nw,string,self.e)
 
 	def dprint(self,string,flag="||"):
 		# flag = green
-		print "\t{}{}{} {}{}{}".format(self.g,str(flag),self.e,self.nw,str(string),self.e)
+		print u"\t{}{}{} {}{}{}".format(self.g,flag,self.e,self.nw,string,self.e)
 
 	def eprint(self,string,flag="||"):
 		# flag = red
-		print "\t{}{}{} {}{}{}".format(self.r,str(flag),self.e,self.nw,str(string),self.e)
+		print u"\t{}{}{} {}{}{}".format(self.r,flag,self.e,self.nw,string,self.e)
 
diff --git a/core/lib/wp_print.pyc b/core/lib/wp_print.pyc
diff --git a/core/lib/wp_request.py b/core/lib/wp_request.py
@@ -51,7 +51,7 @@ def Send(self,url,method='GET',payload=None,headers=None,cookie=None):
 			resp = urllib2.urlopen(req)
 		except urllib2.HTTPError,e:
 			resp = e 
-		return resp.read(),resp.geturl(),resp.getcode(),resp.info()
+		return resp.read().decode('utf-8'),resp.geturl(),resp.getcode(),resp.info()
 
 class NoRedirectHandler(urllib2.HTTPRedirectHandler):
 	def http_error_302(self,req,fp,code,msg,headers):

diff --git a/core/lib/wp_request.pyc b/core/lib/wp_request.pyc
diff --git a/core/modules/__init__.pyc b/core/modules/__init__.pyc
diff --git a/core/modules/wp_attack.pyc b/core/modules/wp_attack.pyc
diff --git a/core/modules/wp_brute.pyc b/core/modules/wp_brute.pyc
diff --git a/core/modules/wp_generic.pyc b/core/modules/wp_generic.pyc
diff --git a/core/modules/wp_plugin.pyc b/core/modules/wp_plugin.pyc
diff --git a/core/modules/wp_theme.pyc b/core/modules/wp_theme.pyc
diff --git a/core/modules/wp_users.py b/core/modules/wp_users.py
@@ -75,7 +75,7 @@ def init(self):
 				users.append(x)
 		if users != []:
 			for z in range(len(users)):
-				self.print_.dprint("ID: {} - Name: {}".format(z,users[z]))
+				self.print_.dprint(u"ID: {} - Name: {}".format(z,users[z]))
 			print ""
 		elif users == []:
 			self.print_.eprint("Not found users ")

diff --git a/core/modules/wp_users.pyc b/core/modules/wp_users.pyc