Merge branch 'crypto' of github.com:beardog108/onionr into crypto

onionr/logger.py

@@ -165,7 +165,7 @@ def readline(message = ''):
 
     sys.stdout.write(output)
     
-    return input()
+    return sys.stdin.readline()
 
 def confirm(default = 'y', message = 'Are you sure %s? '):
     '''

onionr/onionr.py

@@ -93,7 +93,7 @@ class Onionr:
                 if os.path.exists('data/'):
                     break
                 else:
-                    logger.error('Failed to decrypt: ' + result[1])
+                    logger.error('Failed to decrypt: ' + result[1], timestamp = False)
         else:
             if not os.path.exists('data/'):
                 os.mkdir('data/')
@@ -404,7 +404,7 @@ class Onionr:
             Displays a "command not found" message
         '''
 
-        logger.error('Command not found.')
+        logger.error('Command not found.', timestamp = False)
 
     def showHelpSuggestion(self):
         '''