From: Esko Kokkonen <esko.kokkonen@gmail.com>
Date: Fri, 23 Sep 2011 12:17:29 +0000 (+0300)
Subject: Rename functions time() and date()
X-Git-Url: http://git.itanic.dy.fi/?p=emerge-timer;a=commitdiff_plain;h=437abd775c5204b96951da9fdbfe43ff206c7bfe

Rename functions time() and date()

Rename these because time() and date() are probably defined somewhere
else too, and they're not very descriptive function names anyway.
---

diff --git a/emerge-timer.py b/emerge-timer.py
index 208fffa..ce279d2 100755
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -68,11 +68,11 @@ class package:
         """Function used to print all the current emerge stuff"""
 
         print("\t" + green_start + self.name + '-' + self.version +
-              color_stop + "\n\t current time: " + time(self.emerge_time) +
+              color_stop + "\n\t current time: " + give_time(self.emerge_time) +
               "\n\t average time: "),
 
         if len(self.versions) > 1:
-            print(time(self.average_time())),
+            print(give_time(self.average_time())),
         else:
             print("unknown"),
 
@@ -83,7 +83,7 @@ class package:
         print("\n\t time to finish: "),
 
         if finish_time > 0:
-            print(time(finish_time))
+            print(give_time(finish_time))
         else:
             print("any time now")
 
@@ -98,7 +98,7 @@ class package:
 
                 print('-'*90 + "\n" +
                       green_start + self.name + p[0] + color_stop +
-                      "  >>>  " + time(p[1]) + "  >>>  " + date(p[2]))
+                      "  >>>  " + give_time(p[1]) + "  >>>  " + give_date(p[2]))
 
         print('-'*90 + "\n" + "Package " + green_start +
               self.name + color_stop + " emerged " +
@@ -117,7 +117,7 @@ class package:
             aver_time = self.average_time()
 
             if QUIET == False:
-                print("\n\taverage time: " + time(aver_time))
+                print("\n\taverage time: " + give_time(aver_time))
 
             return aver_time
 
@@ -134,15 +134,15 @@ class package:
         average = self.average_time()
         total = self.total_time()
 
-        print("Max time: \t" + time(maxi) +
-              "\nMin time: \t" + time(mini) +
-              "\nAverage time: \t" + time(average) +
-              "\nIn total spent " + time(total) +
+        print("Max time: \t" + give_time(maxi) +
+              "\nMin time: \t" + give_time(mini) +
+              "\nAverage time: \t" + give_time(average) +
+              "\nIn total spent " + give_time(total) +
               " emerging " + green_start + self.name + color_stop)
 
 
 
-def time(time):
+def give_time(time):
     """Converts time in seconds to human readable form"""
     days = time/(3600*24)
     hours = (days - int(days))*24
@@ -190,7 +190,7 @@ def time(time):
 
 
 
-def date(emerge_date):
+def give_date(emerge_date):
     """Returns a date string from a standard POSIX time"""
     date = datetime.datetime.fromtimestamp(emerge_date)
 
@@ -395,7 +395,7 @@ def main(status, user_package=None):
             print
 
         print("Total emerge time of " + green_start + str(len(PACKAGES)) +
-              color_stop + " package(s): "+ time(total_pretended_time))
+              color_stop + " package(s): "+ give_time(total_pretended_time))
 
 
 def usage():