GNOME.org
 

[hamster-applet] renamed utils back to lib as find myself not finding my way around

commit 7eb4eb9e301ea407a41d9814b6806d125ccb5533
Author: Toms Bauģis <toms baugis gmail com>
Date:   Sun Dec 5 11:27:21 2010 +0000

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

 po/POTFILES.in                           |    2 +-
 src/docky_control/2.0/hamster_control.py |    2 +-
 src/docky_control/2.1/hamster_control.py |    2 +-
 src/hamster-applet                       |    2 +-
 src/hamster-cli                          |    4 ++--
 src/hamster-service                      |    2 +-
 src/hamster-time-tracker                 |    4 ++--
 src/hamster/applet.py                    |    2 +-
 src/hamster/client.py                    |    2 +-
 src/hamster/db.py                        |    2 +-
 src/hamster/edit_activity.py             |    2 +-
 src/hamster/{utils => lib}/__init__.py   |    0
 src/hamster/{utils => lib}/charting.py   |    0
 src/hamster/{utils => lib}/graphics.py   |    0
 src/hamster/{utils => lib}/i18n.py       |    0
 src/hamster/{utils => lib}/pytweener.py  |    0
 src/hamster/{utils => lib}/stuff.py      |    0
 src/hamster/{utils => lib}/trophies.py   |    0
 src/hamster/overview.py                  |    4 ++--
 src/hamster/overview_activities.py       |    4 ++--
 src/hamster/overview_totals.py           |    4 ++--
 src/hamster/preferences.py               |    2 +-
 src/hamster/reports.py                   |    4 ++--
 src/hamster/stats.py                     |    4 ++--
 src/hamster/widgets/activityentry.py     |    2 +-
 src/hamster/widgets/dayline.py           |    2 +-
 src/hamster/widgets/facttree.py          |    2 +-
 src/hamster/widgets/rangepick.py         |    2 +-
 src/hamster/widgets/tags.py              |    2 +-
 src/hamster/widgets/timechart.py         |    2 +-
 src/hamster/widgets/timeinput.py         |    2 +-
 tests/stuff_test.py                      |    2 +-
 wscript                                  |    2 +-
 33 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40aac76..c2b6c92 100644
--- a/po/POTFILES.in
+++ b/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
diff --git a/src/docky_control/2.0/hamster_control.py b/src/docky_control/2.0/hamster_control.py
index c426fa3..4e9e9be 100755
--- a/src/docky_control/2.0/hamster_control.py
+++ b/src/docky_control/2.0/hamster_control.py
@@ -33,7 +33,7 @@ from sys import exit
 
 
 from hamster import client
-from hamster.utils import stuff, i18n
+from hamster.lib import stuff, i18n
 i18n.setup_i18n()
 
 
diff --git a/src/docky_control/2.1/hamster_control.py b/src/docky_control/2.1/hamster_control.py
index 10c003a..e759f0c 100755
--- a/src/docky_control/2.1/hamster_control.py
+++ b/src/docky_control/2.1/hamster_control.py
@@ -37,7 +37,7 @@ except ImportError, e:
 
 
 from hamster import client
-from hamster.utils import stuff, i18n
+from hamster.lib import stuff, i18n
 i18n.setup_i18n()
 
 
diff --git a/src/hamster-applet b/src/hamster-applet
index ba8a81f..5121ec5 100755
--- a/src/hamster-applet
+++ b/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
diff --git a/src/hamster-cli b/src/hamster-cli
index 037e810..b6437df 100755
--- a/src/hamster-cli
+++ b/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 = _(
diff --git a/src/hamster-service b/src/hamster-service
index cad1590..467ff18 100755
--- a/src/hamster-service
+++ b/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
diff --git a/src/hamster-time-tracker b/src/hamster-time-tracker
index 5cb8e9a..f57ebc4 100755
--- a/src/hamster-time-tracker
+++ b/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
diff --git a/src/hamster/applet.py b/src/hamster/applet.py
index 73690eb..d3261df 100755
--- a/src/hamster/applet.py
+++ b/src/hamster/applet.py
@@ -34,7 +34,7 @@ import locale
 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
diff --git a/src/hamster/client.py b/src/hamster/client.py
index f1ba55b..1473f36 100644
--- a/src/hamster/client.py
+++ b/src/hamster/client.py
@@ -23,7 +23,7 @@ import datetime as dt
 from calendar import timegm
 import dbus, dbus.mainloop.glib
 import gobject
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 
 
diff --git a/src/hamster/db.py b/src/hamster/db.py
index 77e73c3..33da02e 100644
--- a/src/hamster/db.py
+++ b/src/hamster/db.py
@@ -41,7 +41,7 @@ import datetime as dt
 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
diff --git a/src/hamster/edit_activity.py b/src/hamster/edit_activity.py
index 505ddf8..7470ee5 100644
--- a/src/hamster/edit_activity.py
+++ b/src/hamster/edit_activity.py
@@ -26,7 +26,7 @@ import datetime as dt
 """
 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):
diff --git a/src/hamster/utils/__init__.py b/src/hamster/lib/__init__.py
similarity index 100%
rename from src/hamster/utils/__init__.py
rename to src/hamster/lib/__init__.py
diff --git a/src/hamster/utils/charting.py b/src/hamster/lib/charting.py
similarity index 100%
rename from src/hamster/utils/charting.py
rename to src/hamster/lib/charting.py
diff --git a/src/hamster/utils/graphics.py b/src/hamster/lib/graphics.py
similarity index 100%
rename from src/hamster/utils/graphics.py
rename to src/hamster/lib/graphics.py
diff --git a/src/hamster/utils/i18n.py b/src/hamster/lib/i18n.py
similarity index 100%
rename from src/hamster/utils/i18n.py
rename to src/hamster/lib/i18n.py
diff --git a/src/hamster/utils/pytweener.py b/src/hamster/lib/pytweener.py
similarity index 100%
rename from src/hamster/utils/pytweener.py
rename to src/hamster/lib/pytweener.py
diff --git a/src/hamster/utils/stuff.py b/src/hamster/lib/stuff.py
similarity index 100%
rename from src/hamster/utils/stuff.py
rename to src/hamster/lib/stuff.py
diff --git a/src/hamster/utils/trophies.py b/src/hamster/lib/trophies.py
similarity index 100%
rename from src/hamster/utils/trophies.py
rename to src/hamster/lib/trophies.py
diff --git a/src/hamster/overview.py b/src/hamster/overview.py
index c53600a..3898aed 100644
--- a/src/hamster/overview.py
+++ b/src/hamster/overview.py
@@ -31,8 +31,8 @@ import pango
 
 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
diff --git a/src/hamster/overview_activities.py b/src/hamster/overview_activities.py
index b76eaa6..6b7d0b7 100644
--- a/src/hamster/overview_activities.py
+++ b/src/hamster/overview_activities.py
@@ -36,8 +36,8 @@ from collections import defaultdict
 
 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):
diff --git a/src/hamster/overview_totals.py b/src/hamster/overview_totals.py
index 0cb643f..dd6d13d 100644
--- a/src/hamster/overview_totals.py
+++ b/src/hamster/overview_totals.py
@@ -32,8 +32,8 @@ from collections import defaultdict
 
 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):
diff --git a/src/hamster/preferences.py b/src/hamster/preferences.py
index dce4104..3e9e757 100755
--- a/src/hamster/preferences.py
+++ b/src/hamster/preferences.py
@@ -85,7 +85,7 @@ appearances = ["text", "icon", "both"]
 
 from configuration import runtime, conf, load_ui_file
 import widgets
-from utils import stuff, trophies
+from lib import stuff, trophies
 
 class PreferencesEditor:
     TARGETS = [
diff --git a/src/hamster/reports.py b/src/hamster/reports.py
index 68f64e7..8c2931f 100644
--- a/src/hamster/reports.py
+++ b/src/hamster/reports.py
@@ -28,8 +28,8 @@ import re
 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
 
diff --git a/src/hamster/stats.py b/src/hamster/stats.py
index e77ebaa..3349bf7 100644
--- a/src/hamster/stats.py
+++ b/src/hamster/stats.py
@@ -33,10 +33,10 @@ import gtk, gobject
 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):
diff --git a/src/hamster/widgets/activityentry.py b/src/hamster/widgets/activityentry.py
index fa0a6ac..15878d6 100644
--- a/src/hamster/widgets/activityentry.py
+++ b/src/hamster/widgets/activityentry.py
@@ -21,7 +21,7 @@ import gtk, gobject, pango
 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):
diff --git a/src/hamster/widgets/dayline.py b/src/hamster/widgets/dayline.py
index 4c06a68..d4acf05 100644
--- a/src/hamster/widgets/dayline.py
+++ b/src/hamster/widgets/dayline.py
@@ -23,7 +23,7 @@ import gobject
 import time
 import datetime as dt
 
-from ..utils import stuff, graphics, pytweener
+from ..lib import stuff, graphics, pytweener
 from ..configuration import conf
 
 
diff --git a/src/hamster/widgets/facttree.py b/src/hamster/widgets/facttree.py
index a35b0a3..009b74b 100644
--- a/src/hamster/widgets/facttree.py
+++ b/src/hamster/widgets/facttree.py
@@ -23,7 +23,7 @@ import gtk, gobject
 import cairo
 import datetime as dt
 
-from ..utils import stuff, graphics
+from ..lib import stuff, graphics
 from tags import Tag
 
 import pango
diff --git a/src/hamster/widgets/rangepick.py b/src/hamster/widgets/rangepick.py
index ba77096..a9abb74 100644
--- a/src/hamster/widgets/rangepick.py
+++ b/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
diff --git a/src/hamster/widgets/tags.py b/src/hamster/widgets/tags.py
index d4a9fb0..24946f9 100644
--- a/src/hamster/widgets/tags.py
+++ b/src/hamster/widgets/tags.py
@@ -21,7 +21,7 @@ import gtk, gobject
 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):
diff --git a/src/hamster/widgets/timechart.py b/src/hamster/widgets/timechart.py
index 1b18752..2c01155 100644
--- a/src/hamster/widgets/timechart.py
+++ b/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
diff --git a/src/hamster/widgets/timeinput.py b/src/hamster/widgets/timeinput.py
index 5628acb..c931205 100644
--- a/src/hamster/widgets/timeinput.py
+++ b/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
diff --git a/tests/stuff_test.py b/tests/stuff_test.py
index 47fc43f..fa9c779 100644
--- a/tests/stuff_test.py
+++ b/tests/stuff_test.py
@@ -3,7 +3,7 @@ import sys, os.path
 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):
diff --git a/wscript b/wscript
index 9d1c60a..3402371 100644
--- a/wscript
+++ b/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',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]