Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle crashes

This commit is contained in:
Oleksii Shevchuk 2017-05-23 12:47:38 +03:00
parent ffaa9615e5
commit 11fe90f7f9
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/android_sources/main.py
View File

@ -12,6 +12,11 @@ platform.system = lambda: 'android'
if __name__ == '__main__': if __name__ == '__main__':
import pp import pp
while True: while True:
print "starting pupy ..." try:
pp.main() print "starting pupy ..."
print "pupy exit" pp.main()
print "pupy exit"
except Exception, e:
print "pupy crashed: ", e
import traceback
traceback.print_exc(e)

2
pupy/packages/all/pupyimporter.py
View File

@ -610,5 +610,3 @@ def install(debug=None, trace=False):
if sys.platform == 'win32': if sys.platform == 'win32':
import pywintypes import pywintypes
if __debug:
for module in modules.iterkeys():

10
pupy/pupylib/PupyClient.py
View File

@ -442,11 +442,6 @@ class PupyClient(object):
pupyimporter = self.conn.modules.pupyimporter pupyimporter = self.conn.modules.pupyimporter
initial_module_name = module_name initial_module_name = module_name
if not self.desc.get('native', False):
# If this is not light-weight "client", then try to load native libs frist
if pupyimporter.native_import(module_name):
return True
if not remote and not module_name.endswith(('.dll', '.so')): if not remote and not module_name.endswith(('.dll', '.so')):
if pupyimporter.has_module(module_name): if pupyimporter.has_module(module_name):
if not force: if not force:
@ -455,6 +450,11 @@ class PupyClient(object):
update = True update = True
pupyimporter.invalidate_module(module_name) pupyimporter.invalidate_module(module_name)
if not self.desc.get('native', False):
# If this is not light-weight "client", then try to load native libs frist
if pupyimporter.native_import(module_name):
return True
start_path=module_name.replace(".", "/") start_path=module_name.replace(".", "/")
package_found=False package_found=False
package_path=None package_path=None