src/bitmessagemain.py

@@ -9,7 +9,12 @@
 
 # The software version variable is now held in shared.py
 
-# import ctypes
+# For pre-gevent handling.
+from sys import platform
+
+# Gevent impairs some multiprocessing used by PyBitmessage on POSIX.
+# TODO(fiatflux): reconcile multiprocessing needs with AIO needs.
+if platform == 'win32':
     try:
         from gevent import monkey
         monkey.patch_all()
@@ -18,10 +23,11 @@ except ImportError as ex:
 
 import signal  # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
 # The next 3 are used for the API
-from SimpleXMLRPCServer import *
 import json
-import singleton
 import os
+from SimpleXMLRPCServer import *
+import singleton
+import sys
 
 # Classes
 from class_sqlThread import *
@@ -34,7 +40,6 @@ from class_addressGenerator import *
 # Helper Functions
 import helper_bootstrap
 
-import sys
 if sys.platform == 'darwin':
     if float("{1}.{2}".format(*sys.version_info)) < 7.5:
         print "You should use python 2.7.5 or greater."

src/proofofwork.py

@@ -1,11 +1,7 @@
-#import shared
-#import time
-#from multiprocessing import Pool, cpu_count
 import hashlib
+from shared import config
 from struct import unpack, pack
 import sys
-from shared import config
-#import os
 
 def _set_idle():
     if 'linux' in sys.platform: