Fix correct newline behaviour in python3

[emerge-timer] / emerge-timer.py

diff --git a/emerge-timer.py b/emerge-timer.py
index b6f76403223729525679a9b454f9f4f53bda0996..d782b34996fac6c9b6c791a58a069adace19de77 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -97,26 +97,26 @@ class package:
 
         if len(self.versions) == 1:
             print("\t last time:   "),
-            print(give_time(self.average_time())),
+            print(give_time(self.average_time()), end='')
 
         elif len(self.versions) > 1:
-            print("\t average time:"),
-            print(give_time(self.average_time())),
+            print("\t average time: ", end='')
+            print(give_time(self.average_time()), end='')
 
         else:
             print("\t average time: " + GREEN("unknown\n")),
             return
 
-        print("\n\t " + '-'*45),
+        print("\n\t " + '-'*45, end='')
 
-        print("\n\t time to finish:"),
+        print("\n\t time to finish: ", end='')
 
         if type(self.emerge_time) != str:
 
             finish_time = self.average_time() - self.emerge_time
 
             if finish_time > 0:
-                print(give_time(finish_time))
+                print(give_time(finish_time), "\n")
             else:
                 print(GREEN("any time now"))
         else:
@@ -315,7 +315,7 @@ def open_log():
     try:
         f = open(LOGFILE, 'r')
     except IOError as detail:
-        print detail
+        print(detail)
         sys.exit(1)
 
     return f
@@ -478,7 +478,7 @@ def list_emerge_processes():
 
 
     if len(PACKAGES) == 0:
-        print "No current emerge process found."
+        print("No current emerge process found.")
 
         return 1
 
@@ -495,8 +495,8 @@ def list_emerge_processes():
                     timestamp = datetime.datetime.fromtimestamp(time)
                     difference = (now - timestamp).total_seconds()
 
-                    if ((difference < p.emerge_time) or
-                        (p.emerge_time == "infinity")):
+                    if ((p.emerge_time == "infinity") or
+                        (difference < p.emerge_time)):
 
                         p.emerge_time = difference
 
@@ -506,9 +506,9 @@ def list_emerge_processes():
 def search_syncs():
     f = open_log()
 
-    print "These emerge syncs found"
-    print "\tDate                    Server"
-    print "\t------------------------------"
+    print("These emerge syncs found")
+    print("\tDate                    Server")
+    print("\t------------------------------")
 
     a = 0
     for line in f:
@@ -567,7 +567,7 @@ def _main(status, user_package=None):
         if list_emerge_processes():
             return
 
-        print "Currently emerging:"
+        print("Currently emerging:")
 
         for p in PACKAGES:
             search_log_for_package(p)
@@ -577,7 +577,7 @@ def _main(status, user_package=None):
     elif status == "pretended":
         list_pretended()
 
-        print "This is how long these packages would take to emerge"
+        print("This is how long these packages would take to emerge")
 
         total_pretended_time = 0
 
@@ -609,7 +609,7 @@ Options:
 \t\t\t (needs matlibplot installed for this to work)"""
 
 
-    print usage
+    print(usage)
 
     sys.exit(0)