renamed utils back to lib as find myself not finding my way around

po/POTFILES.in

@@ -27,6 +27,6 @@ src/hamster/preferences.py
 src/hamster/reports.py
 src/hamster-time-tracker
 src/hamster/stats.py
-src/hamster/utils/stuff.py
+src/hamster/lib/stuff.py
 src/hamster/widgets/reportchooserdialog.py
 src/hamster/widgets/timechart.py

src/docky_control/2.0/hamster_control.py

@@ -33,7 +33,7 @@
 
 
 from hamster import client
-from hamster.utils import stuff, i18n
+from hamster.lib import stuff, i18n
 i18n.setup_i18n()
 
 

src/docky_control/2.1/hamster_control.py

@@ -37,7 +37,7 @@
 
 
 from hamster import client
-from hamster.utils import stuff, i18n
+from hamster.lib import stuff, i18n
 i18n.setup_i18n()
 
 

src/hamster-applet

@@ -90,7 +90,7 @@ if __name__ == "__main__":
                             format = log_format)
 
     try:
-        from hamster.utils import i18n
+        from hamster.lib import i18n
         i18n.setup_i18n()
 
         from hamster.configuration import runtime, dialogs

src/hamster-cli

@@ -27,7 +27,7 @@ import re
 import datetime as dt
 
 from hamster import client
-from hamster.utils import stuff
+from hamster.lib import stuff
 
 class ConfigurationError(Exception):
     '''An error of configuration.'''
@@ -203,7 +203,7 @@ def fact_dict(fact_data, with_date):
 
 
 if __name__ == '__main__':
-    from hamster.utils import i18n
+    from hamster.lib import i18n
     i18n.setup_i18n()
 
     usage = _(

src/hamster-service

@@ -13,7 +13,7 @@ if "org.gnome.Hamster" in dbus.SessionBus().list_names():
 
 
 if __name__ == '__main__':
-    from hamster.utils import i18n
+    from hamster.lib import i18n
     i18n.setup_i18n()
 
     from hamster import db

src/hamster-time-tracker

@@ -485,7 +485,7 @@ class WindowServer(dbus.service.Object):
 
 
 if __name__ == "__main__":
-    from hamster.utils import i18n
+    from hamster.lib import i18n
     i18n.setup_i18n()
 
     # determine the window we will be launching
@@ -522,7 +522,7 @@ if __name__ == "__main__":
     gtk.window_set_default_icon_name("hamster-applet")
 
     from hamster import widgets, idle
-    from hamster.utils import stuff, trophies
+    from hamster.lib import stuff, trophies
 
     try:
         import wnck

src/hamster/applet.py

@@ -34,7 +34,7 @@
 from configuration import conf, runtime, dialogs, load_ui_file
 
 import widgets, idle
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 try:
     import wnck

src/hamster/client.py

@@ -23,7 +23,7 @@
 from calendar import timegm
 import dbus, dbus.mainloop.glib
 import gobject
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 
 

src/hamster/db.py

@@ -41,7 +41,7 @@
 import gio
 from xdg.BaseDirectory import xdg_data_home
 
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 class Storage(storage.Storage):
     con = None # Connection will be created on demand

src/hamster/edit_activity.py

@@ -26,7 +26,7 @@
 """
 import widgets
 from configuration import runtime, conf, load_ui_file
-from utils import stuff
+from lib import stuff
 
 class CustomFactController:
     def __init__(self,  parent = None, fact_date = None, fact_id = None):

src/hamster/overview.py

@@ -31,8 +31,8 @@
 
 import widgets, reports
 from configuration import runtime, conf, dialogs, load_ui_file
-from utils import stuff, trophies
-from utils.i18n import C_
+from lib import stuff, trophies
+from lib.i18n import C_
 
 from overview_activities import OverviewBox
 from overview_totals import TotalsBox

src/hamster/overview_activities.py

@@ -36,8 +36,8 @@
 
 import widgets
 from configuration import runtime, dialogs
-from utils import stuff, trophies
-from utils.i18n import C_
+from lib import stuff, trophies
+from lib.i18n import C_
 
 
 class OverviewBox(gtk.VBox):

src/hamster/overview_totals.py

@@ -32,8 +32,8 @@
 
 import widgets, reports
 from configuration import runtime, dialogs, load_ui_file
-from utils import stuff, charting
-from utils.i18n import C_
+from lib import stuff, charting
+from lib.i18n import C_
 
 
 class TotalsBox(gtk.VBox):

src/hamster/preferences.py

@@ -85,7 +85,7 @@ def __init__(self):
 
 from configuration import runtime, conf, load_ui_file
 import widgets
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 class PreferencesEditor:
     TARGETS = [

src/hamster/reports.py

@@ -28,8 +28,8 @@
 from string import Template
 
 from configuration import runtime
-from utils import stuff, trophies
-from utils.i18n import C_
+from lib import stuff, trophies
+from lib.i18n import C_
 
 from calendar import timegm
 

src/hamster/stats.py

@@ -33,10 +33,10 @@
 import pango
 
 import widgets
-from utils import stuff, charting, graphics
+from lib import stuff, charting, graphics
 from configuration import runtime, conf, load_ui_file
 
-from utils.i18n import C_
+from lib.i18n import C_
 
 class Stats(object):
     def __init__(self, parent = None):

src/hamster/widgets/activityentry.py

@@ -21,7 +21,7 @@
 import datetime as dt
 
 from ..configuration import runtime
-from ..utils import stuff, graphics
+from ..lib import stuff, graphics
 from .. import external
 
 class ActivityEntry(gtk.Entry):

src/hamster/widgets/dayline.py

@@ -23,7 +23,7 @@
 import time
 import datetime as dt
 
-from ..utils import stuff, graphics, pytweener
+from ..lib import stuff, graphics, pytweener
 from ..configuration import conf
 
 

src/hamster/widgets/facttree.py

@@ -23,7 +23,7 @@
 import cairo
 import datetime as dt
 
-from ..utils import stuff, graphics
+from ..lib import stuff, graphics
 from tags import Tag
 
 import pango

src/hamster/widgets/rangepick.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
 
-from ..utils import stuff
+from ..lib import stuff
 from ..configuration import load_ui_file
 
 import gtk, gobject, pango

src/hamster/widgets/tags.py

@@ -21,7 +21,7 @@
 import pango, cairo
 from math import pi
 
-from ..utils import graphics, stuff
+from ..lib import graphics, stuff
 from ..configuration import runtime
 
 class TagsEntry(gtk.Entry):

src/hamster/widgets/timechart.py

@@ -20,7 +20,7 @@
 import os  # for locale
 import gobject, gtk, pango
 
-from ..utils import graphics, stuff
+from ..lib import graphics, stuff
 
 import time, datetime as dt
 import calendar

src/hamster/widgets/timeinput.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
 
-from ..utils.stuff import format_duration
+from ..lib.stuff import format_duration
 import gtk
 from gtk import keysyms
 import datetime as dt

tests/stuff_test.py

@@ -3,7 +3,7 @@
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "..")))
 
 import unittest
-from hamster.utils import stuff
+from hamster.lib import stuff
 
 class TestActivityInputParsing(unittest.TestCase):
     def test_plain_name(self):

wscript

@@ -61,7 +61,7 @@ def build(bld):
 
     bld.install_files('${PYTHONDIR}/hamster', 'src/hamster/*.py')
     bld.install_files('${PYTHONDIR}/hamster/widgets', 'src/hamster/widgets/*.py')
-    bld.install_files('${PYTHONDIR}/hamster/utils', 'src/hamster/utils/*.py')
+    bld.install_files('${PYTHONDIR}/hamster/lib', 'src/hamster/lib/*.py')
 
     bld.install_files('${DATADIR}/docky/helpers',
                       'src/docky_control/2.0/hamster_control.py',