Merge branch 'master' of /home/git/emerge-timer

diff --combined emerge-timer.py
index 758a51a2f4af1d0245c0768d6fe50e74bf1871f9,b6f76403223729525679a9b454f9f4f53bda0996..3bfc86141f938e23b008a1215f4025982d45ae0f
--- 1/emerge-timer.py
--- 2/emerge-timer.py
+++ b/emerge-timer.py
@@@ -40,11 -40,16 +40,16 @@@ class package
  
      def seek_versions(self, whatToSeek, Input):
  
-         if whatToSeek == "version":
+         if whatToSeek == "date":
              for i in self.versions:
                  if i[1] == Input:
                      return i[2]
  
+         if whatToSeek == "version":
+             for i in self.versions:
+                 if i[1] == Input:
+                     return i[0]
+ 
  
      def average_time(self):
          """Return average time from class version list"""
@@@ -193,13 -198,28 +198,28 @@@
          average = self.average_time()
          total = self.total_time()
  
-         print("Max time:\t" + give_time(maxi) + "on " +
-               give_date(self.seek_versions("version", maxi)) +
-               "\nMin time:\t" + give_time(mini) + "on " +
-               give_date(self.seek_versions("version", mini)) +
-               "\nAverage time:\t" + give_time(average) +
-               "\n\nIn total spent:\t" + give_time(total) +
-               "emerging " + GREEN(self.name))
+         print("-"*20 +
+               "\nMaximum emerge time:\n" +
+               give_time(maxi) + "for version " +
+               GREEN(self.seek_versions("version", maxi).lstrip("-"))
+               + " on " +
+               give_date(self.seek_versions("date", maxi)))
+ 
+         print("-"*20 +
+               "\nMinimum emerge time:\n" +
+               give_time(mini) + "for version " +
+               GREEN(self.seek_versions("version", mini).lstrip("-"))
+               + " on " +
+               give_date(self.seek_versions("date", mini)))
+ 
+         print("-"*20 +
+               "\nAverage emerge time:\n" +
+               give_time(average))
+ 
+         print("-"*20 +
+               "\nIn total spent:\n" +
+               give_time(total))
+ 
  
      def plotToScreen(self):
          dates = []
@@@ -295,7 -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
@@@ -458,7 -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
  
@@@ -486,9 -506,9 +506,9 @@@
  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:
@@@ -547,7 -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)
@@@ -557,7 -577,7 +577,7 @@@
      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
  
@@@ -589,7 -609,7 +609,7 @@@ Options
  \t\t\t (needs matlibplot installed for this to work)"""
  
  
 -    print usage
 +    print(usage)
  
      sys.exit(0)