summaryrefslogtreecommitdiffstats
path: root/pykolab
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2010-08-26 11:57:20 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2010-08-26 11:57:20 +0200
commit1119b629ca26edfbac1bbb519136e3e664cad4fc (patch)
tree98ab61b384830bc10d313b04a79675c75c25f902 /pykolab
parentb2939c5516e3f8d3dc77ccbc5ddbfc46938c2423 (diff)
downloadpykolab-1119b629ca26edfbac1bbb519136e3e664cad4fc.tar.gz
Make the compile/build time variables appear in constants, and then re-use constants
Diffstat (limited to 'pykolab')
-rw-r--r--pykolab/__init__.py28
-rw-r--r--pykolab/cli/__init__.py (renamed from pykolab/__init__.py.in)21
-rw-r--r--pykolab/constants.py.in (renamed from pykolab/constants.py)14
3 files changed, 50 insertions, 13 deletions
diff --git a/pykolab/__init__.py b/pykolab/__init__.py
new file mode 100644
index 0000000..ac6f538
--- /dev/null
+++ b/pykolab/__init__.py
@@ -0,0 +1,28 @@
+# Copyright 2010 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+import traceback
+import shutil
+import sys
+
+import pykolab
+import pykolab.plugins
+
+from pykolab.translate import _
+from pykolab.conf import Conf
+from pykolab.constants import *
diff --git a/pykolab/__init__.py.in b/pykolab/cli/__init__.py
index 056f3c6..1b960b2 100644
--- a/pykolab/__init__.py.in
+++ b/pykolab/cli/__init__.py
@@ -16,18 +16,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-__license__ = "GPLv2+"
-__copyright__ = "Kolab Systems AG"
-__version__ = @VERSION@
-__release__ = @RELEASE@
-
-if @RELEASE@ < 1:
- __status__ = 'snapshot'
-elif math.round(@RELEASE@,0) < @RELEASE@:
- __status__ = 'prerelease'
-else:
- __status__ = 'stable'
-
import traceback
import shutil
import sys
@@ -38,3 +26,12 @@ import pykolab.plugins
from pykolab.translate import _
from pykolab.conf import Conf
+from pykolab.constants import *
+
+class Cli(object):
+ def __init__(self):
+ self.conf = Conf()
+ print "%r" %(self.conf.args)
+
+ def run(self):
+ print >> sys.stderr, _("Running")
diff --git a/pykolab/constants.py b/pykolab/constants.py.in
index 84d4a32..ae4b52f 100644
--- a/pykolab/constants.py
+++ b/pykolab/constants.py.in
@@ -22,6 +22,18 @@ import sys
from pykolab.translate import _
+__license__ = "GPLv2+"
+__copyright__ = "Kolab Systems AG"
+__version__ = @VERSION@
+__release__ = @RELEASE@
+
+if @RELEASE@ < 1:
+ __status__ = 'snapshot'
+elif math.round(@RELEASE@,0) < @RELEASE@:
+ __status__ = 'prerelease'
+else:
+ __status__ = 'stable'
+
domain = 'pykolab'
epilog = _( "PyKolab is a Kolab Systems product. For more information " + \
@@ -68,4 +80,4 @@ SERVICE_MAP = {
'type': 'openldap',
'description': _('OpenLDAP or compatible')
},
- } \ No newline at end of file
+ }