[Pymoul-svn] SF.net SVN: pymoul: [124] pymoul/trunk/src/moul

[<ti...@us...>]

Revision: 124
          http://pymoul.svn.sourceforge.net/pymoul/?rev=124&view=rev
Author:   tiran
Date:     2007-02-02 09:45:42 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
Fixed errors introduced by the run of importorder / importcheck

Modified Paths:
--------------
    pymoul/trunk/src/moul/__init__.py
    pymoul/trunk/src/moul/file/localization.py
    pymoul/trunk/src/moul/qt/mainwindow.py
    pymoul/trunk/src/moul/qt/ui/mainwindow.py
    pymoul/trunk/src/moul/qt/ui/moulqt_rc.py
    pymoul/trunk/src/moul/qt/ui/simpleprogressbar.py
    pymoul/trunk/src/moul/time/cavern.py

Modified: pymoul/trunk/src/moul/__init__.py
===================================================================
--- pymoul/trunk/src/moul/__init__.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/__init__.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -3,8 +3,6 @@
 try:
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError:
-    from pkgutil import extend_p
-
-ath
+    from pkgutil import extend_path
     __path__ = extend_path(__path__, __name__)
 

Modified: pymoul/trunk/src/moul/file/localization.py
===================================================================
--- pymoul/trunk/src/moul/file/localization.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/file/localization.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -17,9 +17,9 @@
 #
 """LOC file parser
 """
+from __future__ import with_statement
 import glob
 import os
-from __future__ import with_statement
 from xml.sax import ContentHandler
 from xml.sax import make_parser
 from xml.sax.handler import feature_namespaces

Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/qt/mainwindow.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -18,13 +18,14 @@
 
 """Moul QT GUI main windows
 """
+from __future__ import with_statement
+
 import sys
 from PyQt4 import QtCore
 from PyQt4 import QtGui
 from PyQt4.QtCore import Qt
 from PyQt4.QtCore import SIGNAL
 from PyQt4.QtCore import pyqtSignature
-from __future__ import with_statement
 
 from moul import metadata
 from moul.config import lookupDir

Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'src/moul/qt/ui/mainwindow.ui'
+# Form implementation generated from reading ui file './src/moul/qt/ui/mainwindow.ui'
 #
-# Created: Fri Feb  2 17:26:46 2007
+# Created: Fri Feb  2 18:43:30 2007
 #      by: PyQt4 UI code generator 4.1.1
 #
-# WARNING! All changes made in this file will be losimport sys
-from PyQt4 import QtCore, Qt
+# WARNING! All changes made in this file will be lost!
 
-t!
+import sys
+from PyQt4 import QtCore, QtGui
 
-Gui
-
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName("MainWindow")

Modified: pymoul/trunk/src/moul/qt/ui/moulqt_rc.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/moulqt_rc.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/qt/ui/moulqt_rc.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -2,15 +2,13 @@
 
 # Resource object code
 #
-# Created: So Jan 28 18:10:39 2007
+# Created: Fr Feb 2 18:43:48 2007
 #      by: The Resource Compiler for PyQt (Qt v4.2.0)
 #
-# WARNING! All changes made in this file will be losfrom PyQt4 import QtC
+# WARNING! All changes made in this file will be lost!
 
-t!
+from PyQt4 import QtCore
 
-ore
-
 qt_resource_data = "\
 \x00\x00\x07\xea\
 \x89\

Modified: pymoul/trunk/src/moul/qt/ui/simpleprogressbar.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/simpleprogressbar.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/qt/ui/simpleprogressbar.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'src/moul/qt/ui/simpleprogressbar.ui'
+# Form implementation generated from reading ui file './src/moul/qt/ui/simpleprogressbar.ui'
 #
-# Created: Fri Feb  2 15:36:30 2007
+# Created: Fri Feb  2 18:43:31 2007
 #      by: PyQt4 UI code generator 4.1.1
 #
-# WARNING! All changes made in this file will be losimport sys
-from PyQt4 import QtCore, Qt
+# WARNING! All changes made in this file will be lost!
 
-t!
+import sys
+from PyQt4 import QtCore, QtGui
 
-Gui
-
 class Ui_SimpleProgressbar(object):
     def setupUi(self, SimpleProgressbar):
         SimpleProgressbar.setObjectName("SimpleProgressbar")

Modified: pymoul/trunk/src/moul/time/cavern.py
===================================================================
--- pymoul/trunk/src/moul/time/cavern.py	2007-02-02 17:37:43 UTC (rev 123)
+++ pymoul/trunk/src/moul/time/cavern.py	2007-02-02 17:45:42 UTC (rev 124)
@@ -24,20 +24,17 @@
 __all__ = ['CavernTime']
 
 from datetime import datetime
-from pytz import all_timezones
-from pytz import timezone
-from pytz import utc as UTC
 
 from moul.osdependent import __FROZEN__
-
 # pytz is an egg
 if not __FROZEN__:
     import pkg_resources
     pkg_resources.require("pytz>=2006p")
 
-#from pytz import common_timezones
+from pytz import all_timezones
+from pytz import timezone
+from pytz import utc as UTC
 
-
 ## not used in the current version
 #SUPPORTED_TZ = ('America', 'Canada', 'Etc', 'Europe', 'US')
 #ADDITIONAL_TZ = ('GMT', 'UTC')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.