Merge pull request AlessandroZ#225 from newlog/bugfix/print_to_stdout

Bugfix/print to stdout Former-commit-id: b4d7e75 [formerly b4d7e75 [formerly 64d9cc7]] Former-commit-id: 12c940af3c4c869548fc694ac0bddd643c89aa38 Former-commit-id: bab132b
jasmeetsingh001 · Mar 22, 2018 · 47d6048 · 47d6048
2 parents c9cd40c + cb4f9ce
commit 47d6048
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea
+*.pyc
+venv
diff --git a/Linux/laZagne.py b/Linux/laZagne.py
@@ -72,7 +72,7 @@ def verbosity():
 	elif 	args['verbose'] >= 2: level = logging.DEBUG
 
 	formatter 	= logging.Formatter(fmt='%(message)s')
-	stream 		= logging.StreamHandler()
+	stream 		= logging.StreamHandler(sys.stdout)
 	stream.setFormatter(formatter)
 	root = logging.getLogger()
 	root.setLevel(level)

diff --git a/Linux/lazagne/softwares/chats/pidgin.py b/Linux/lazagne/softwares/chats/pidgin.py
@@ -5,15 +5,22 @@
 from lazagne.config.constant import *
 import xml.etree.cElementTree as ET
 from lazagne.config import homes
-import dbus
 import os
 
+try:
+    import dbus
+except ImportError as e:
+    dbus = None
+
+
 class Pidgin(ModuleInfo):
 	def __init__(self):
 		ModuleInfo.__init__(self, 'pidgin', 'chats')
 
 	# If pidgin is started, use the api to retrieve all passwords
 	def check_if_pidgin_started(self):
+                if not dbus:
+                    return False
 		try:
 			pwdFound 	= []
 			bus 		= dbus.SessionBus()
@@ -38,7 +45,7 @@ def run(self, software_name=None):
 		pwdFound = []
 		try:
 			pwdTab = self.check_if_pidgin_started()
-			if pwdTab != False:
+			if pwdTab:
 				pwdFound = pwdTab
 		except:
 			pass

diff --git a/Linux/requirement.txt b/Linux/requirement.txt
@@ -1,3 +1,4 @@
 pycrypto
 pyasn1
 https://github.com/n1nj4sec/memorpy/archive/master.zip
+psutil
diff --git a/Mac/laZagne.py b/Mac/laZagne.py
@@ -71,7 +71,7 @@ def verbosity():
 
 	FORMAT 		= "%(message)s"
 	formatter 	= logging.Formatter(fmt=FORMAT)
-	stream 		= logging.StreamHandler()
+	stream 		= logging.StreamHandler(sys.stdout)
 	stream.setFormatter(formatter)
 
 	root = logging.getLogger()

diff --git a/Windows/laZagne.py b/Windows/laZagne.py
@@ -83,7 +83,7 @@ def verbosity():
 	elif 	args['verbose'] >= 2: level = logging.DEBUG
 
 	formatter 	= logging.Formatter(fmt='%(message)s')
-	stream 		= logging.StreamHandler()
+	stream 		= logging.StreamHandler(sys.stdout)
 	stream.setFormatter(formatter)
 	root = logging.getLogger()
 	root.setLevel(level)
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    .idea
+    *.pyc
+    venv