From ba27f6e8a69ac484571a08c5f42307e1442cb2c1 Mon Sep 17 00:00:00 2001
From: Jonathan Warren <Atheros1@users.noreply.github.com>
Date: Thu, 19 Mar 2015 18:09:04 -0400
Subject: [PATCH] Made error message for Raspberry Pi users less
 serious-sounding

---
 src/bitmessagemain.py | 9 ++-------
 src/helper_startup.py | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 732c16c5..bf1d74f2 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -20,6 +20,8 @@ import socket
 import ctypes
 from struct import pack
 import sys
+from subprocess import call
+import time
 
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 from api import MySimpleXMLRPCRequestHandler
@@ -30,25 +32,18 @@ from helper_sql import sqlQuery
 import threading
 
 # Classes
-#from helper_sql import *
-#from class_sqlThread import *
 from class_sqlThread import sqlThread
 from class_singleCleaner import singleCleaner
-#from class_singleWorker import *
 from class_objectProcessor import objectProcessor
 from class_outgoingSynSender import outgoingSynSender
 from class_singleListener import singleListener
 from class_singleWorker import singleWorker
-#from class_addressGenerator import *
 from class_addressGenerator import addressGenerator
 from debug import logger
 
 # Helper Functions
 import helper_bootstrap
 import helper_generic
-
-from subprocess import call
-import time
     
 
 def connectToStream(streamNumber):
diff --git a/src/helper_startup.py b/src/helper_startup.py
index ef40dd51..778fe70a 100644
--- a/src/helper_startup.py
+++ b/src/helper_startup.py
@@ -145,5 +145,5 @@ def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
             return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
         return False
     except Exception as err:
-        print 'An Exception occurred within isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections:', err
+        print "Info: we could not tell whether your OS is limited to having very view half open connections because we couldn't interpret the platform version. Don't worry; we'll assume that it is not limited. This tends to occur on Raspberry Pis. :", err
         return False