Größerer Umbau Teil 3

git-svn-id: http://svn.brehm-online.com/svn/my-stuff/python/PyLogrotate/trunk@287 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa

diff --git a/LogRotate/Config.py b/LogRotate/Config.py
index ba613deafd5bbdc4c9bca08f8deeb44ddb7ff32d..3fc96a7f0b0429b94d368f16a3f84ae035be95e9 100755 (executable)
--- a/LogRotate/Config.py
+++ b/LogRotate/Config.py
@@ -25,9 +25,15 @@ import glob
 import logging
 import email.utils
 
-from LogRotateCommon import split_parts, email_valid, period2days, human2bytes
-from LogRotateCommon import get_address_list
-from LogRotateScript import LogRotateScript
+try:
+    import LogRotate.Common
+except ImportError:
+    sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..')))
+    import LogRotate.Common
+
+from LogRotate.Common import split_parts, email_valid, period2days, human2bytes
+from LogRotate.Common import get_address_list
+from LogRotate.Script import LogRotateScript
 
 revision = '$Revision$'
 revision = re.sub( r'\$', '', revision )

diff --git a/LogRotate/Handler.py b/LogRotate/Handler.py
index dda18524e067c995b1e1748c93922d14c18c2ae3..36d0ac26664d1c9993acb36498d83d034ab3f5d8 100755 (executable)
--- a/LogRotate/Handler.py
+++ b/LogRotate/Handler.py
@@ -33,15 +33,21 @@ import gzip
 import bz2
 import zipfile
 
-from LogRotateConfig import LogrotateConfigurationError
-from LogRotateConfig import LogrotateConfigurationReader
+try:
+    import LogRotate.Common
+except ImportError:
+    sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..')))
+    import LogRotate.Common
 
-from LogRotateStatusFile import LogrotateStatusFileError
-from LogRotateStatusFile import LogrotateStatusFile
-from LogRotateStatusFile import utc
+from LogRotate.Config import LogrotateConfigurationError
+from LogRotate.Config import LogrotateConfigurationReader
 
-from LogRotateMailer import LogRotateMailerError
-from LogRotateMailer import LogRotateMailer
+from LogRotate.StatusFile import LogrotateStatusFileError
+from LogRotate.StatusFile import LogrotateStatusFile
+from LogRotate.StatusFile import utc
+
+from LogRotate.Mailer import LogRotateMailerError
+from LogRotate.Mailer import LogRotateMailer
 
 revision = '$Revision$'
 revision = re.sub( r'\$', '', revision )

diff --git a/LogRotate/Mailer.py b/LogRotate/Mailer.py
index 9ff2628f63c2b7bbe501af2f5ea4393bbe04ecc4..051fc62d60af72b7a179189bda6c0b4f7d1d10a2 100755 (executable)
--- a/LogRotate/Mailer.py
+++ b/LogRotate/Mailer.py
@@ -38,7 +38,13 @@ from email.mime.text import MIMEText
 
 from quopri import encodestring as _encodestring
 
-from LogRotateCommon import email_valid
+try:
+    import LogRotate.Common
+except ImportError:
+    sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..')))
+    import LogRotate.Common
+
+from LogRotate.Common import email_valid
 
 revision = '$Revision$'
 revision = re.sub( r'\$', '', revision )

diff --git a/LogRotate/StatusFile.py b/LogRotate/StatusFile.py
index 5dc4b3c32fc08be82ddaf714dae235a70a87bcde..0de706c6c33b074104b908c8d42fefe225332ec7 100755 (executable)
--- a/LogRotate/StatusFile.py
+++ b/LogRotate/StatusFile.py
@@ -23,7 +23,13 @@ import pprint
 
 from datetime import tzinfo, timedelta, datetime, date, time
 
-from LogRotateCommon import split_parts 
+try:
+    import LogRotate.Common
+except ImportError:
+    sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..')))
+    import LogRotate.Common
+
+from LogRotate.Common import split_parts 
 
 revision = '$Revision$'
 revision = re.sub( r'\$', '', revision )

diff --git a/babel.cfg b/babel.cfg
new file mode 100644 (file)
index 0000000..8e794f3
--- /dev/null
+++ b/babel.cfg
@@ -0,0 +1,4 @@
+
+[python: **.py]
+
+output_file = "locale/messages.pot"

diff --git a/logrotate.py b/logrotate.py
index 2c2f96202c254d7a1653e4221cefbe71a3b932a9..1e53b9c6e76072c671cc4ab59cf1457d3be6ef0c 100755 (executable)
--- a/logrotate.py
+++ b/logrotate.py
@@ -9,7 +9,7 @@
 @contact: frank@brehm-online.com
 @license: GPL3
 @copyright: (c) 2010-2011 by Frank Brehm, Berlin
-@version: 0.5.3
+@version: 0.6.0
 @summary: rotates and compress system logs
 '''
 
@@ -36,7 +36,7 @@ revision = re.sub( r'Revision: ', r'r', revision )
 __author__    = 'Frank Brehm'
 __copyright__ = '(C) 2011 by Frank Brehm, Berlin'
 __contact__    = 'frank@brehm-online.com'
-__version__    = '0.5.3 ' + revision
+__version__    = '0.6.0 ' + revision
 __license__    = 'GPL3'
 
 

diff --git a/setup.cfg b/setup.cfg
new file mode 100644 (file)
index 0000000..99c0c80
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,11 @@
+
+[extract_messages]
+
+keywords = _, gettext, ngettext
+mapping_file = babel.cfg
+width = 76
+charset = utf-8
+copyright-holder = "2011 Frank Brehm, Berlin"
+sort-output = True
+;sort-by-file = True
+output-file = locale/pylogrotate.pot

diff --git a/setup.py b/setup.py
new file mode 100755 (executable)
index 0000000..9c1b47f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# $Id$
+# $URL$
+
+'''
+@author: Frank Brehm
+@contact: frank@brehm-online.com
+@license: GPL3
+@copyright: (c) 2010-2011 by Frank Brehm, Berlin
+@version: 0.6.0
+@summary: setup for pylogrotate
+'''
+
+from setuptools import setup
+
+setup(
+    name='pylogrotate',
+    version='0.6.0',
+    description='rotates and compress system logs',
+    author='Frank Brehm',
+    author_email='frank@brehm-online.com',
+    url='http://svn.brehm-online.com/svn/my-stuff/python/PyLogrotate/',
+    packages=['LogRotate'],
+    scripts = ['logrotate.py'],
+)
+
+
+
+#========================================================================
+
+# vim: fileencoding=utf-8 filetype=python ts=4 expandtab