ENH: Change all imports to "." style relative imports

fail2ban/client/actionreader.py

@@ -26,7 +26,7 @@ __license__ = "GPL"
 
 import logging, os
 
-from fail2ban.client.configreader import ConfigReader, DefinitionInitConfigReader
+from .configreader import ConfigReader, DefinitionInitConfigReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/beautifier.py

@@ -23,7 +23,7 @@ __license__ = "GPL"
 
 import logging
 
-from fail2ban.exceptions import UnknownJailException, DuplicateJailException
+from ..exceptions import UnknownJailException, DuplicateJailException
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/configreader.py

@@ -27,7 +27,7 @@ __license__ = "GPL"
 import glob, logging, os
 from ConfigParser import NoOptionError, NoSectionError
 
-from fail2ban.client.configparserinc import SafeConfigParserWithIncludes
+from .configparserinc import SafeConfigParserWithIncludes
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/configurator.py

@@ -26,9 +26,9 @@ __license__ = "GPL"
 
 import logging
 
-from fail2ban.client.configreader import ConfigReader
+from .configreader import ConfigReader
-from fail2ban.client.fail2banreader import Fail2banReader
+from .fail2banreader import Fail2banReader
-from fail2ban.client.jailsreader import JailsReader
+from .jailsreader import JailsReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/fail2banreader.py

@@ -26,7 +26,7 @@ __license__ = "GPL"
 
 import logging
 
-from fail2ban.client.configreader import ConfigReader
+from .configreader import ConfigReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/filterreader.py

@@ -26,7 +26,7 @@ __license__ = "GPL"
 
 import logging, os, shlex
 
-from fail2ban.client.configreader import ConfigReader, DefinitionInitConfigReader
+from .configreader import ConfigReader, DefinitionInitConfigReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/jailreader.py

@@ -27,9 +27,9 @@ __license__ = "GPL"
 import logging, re, glob, os.path
 import json
 
-from fail2ban.client.configreader import ConfigReader
+from .configreader import ConfigReader
-from fail2ban.client.filterreader import FilterReader
+from .filterreader import FilterReader
-from fail2ban.client.actionreader import ActionReader
+from .actionreader import ActionReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/client/jailsreader.py

@@ -26,8 +26,8 @@ __license__ = "GPL"
 
 import logging
 
-from fail2ban.client.configreader import ConfigReader
+from .configreader import ConfigReader
-from fail2ban.client.jailreader import JailReader
+from .jailreader import JailReader
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/actions.py

@@ -28,10 +28,10 @@ import time, logging
 import os
 import imp
 
-from fail2ban.server.banmanager import BanManager
+from .banmanager import BanManager
-from fail2ban.server.jailthread import JailThread
+from .jailthread import JailThread
-from fail2ban.server.action import ActionBase, CommandAction, CallingMap
+from .action import ActionBase, CommandAction, CallingMap
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/asyncserver.py

@@ -27,7 +27,7 @@ __license__ = "GPL"
 from pickle import dumps, loads, HIGHEST_PROTOCOL
 import asyncore, asynchat, socket, os, logging, sys, traceback, fcntl
 
-from fail2ban import helpers
+from .. import helpers
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/banmanager.py

@@ -27,8 +27,8 @@ __license__ = "GPL"
 import logging
 from threading import Lock
 
-from fail2ban.server.ticket import BanTicket
+from .ticket import BanTicket
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/database.py

@@ -29,8 +29,8 @@ import json
 import locale
 from functools import wraps
 
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
-from fail2ban.server.ticket import FailTicket
+from .ticket import FailTicket
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/datedetector.py

@@ -24,7 +24,7 @@ __license__ = "GPL"
 import sys, time, logging
 from threading import Lock
 
-from fail2ban.server.datetemplate import DatePatternRegex, DateTai64n, DateEpoch, DateISO8601
+from .datetemplate import DatePatternRegex, DateTai64n, DateEpoch, DateISO8601
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/datetemplate.py

@@ -29,8 +29,8 @@ import logging
 from datetime import datetime
 from datetime import timedelta
 
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
-from fail2ban.server import iso8601
+from . import iso8601
 
 logSys = logging.getLogger(__name__)
 

fail2ban/server/failmanager.py

@@ -27,8 +27,8 @@ __license__ = "GPL"
 from threading import Lock
 import logging
 
-from fail2ban.server.faildata import FailData
+from .faildata import FailData
-from fail2ban.server.ticket import FailTicket
+from .ticket import FailTicket
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/filter.py

@@ -23,15 +23,14 @@ __license__ = "GPL"
 
 import logging, re, os, fcntl, time, sys, locale, codecs
 
-from fail2ban.server.failmanager import FailManagerEmpty
+from .failmanager import FailManagerEmpty, FailManager
-from fail2ban.server.failmanager import FailManager
+from .ticket import FailTicket
-from fail2ban.server.ticket import FailTicket
+from .jailthread import JailThread
-from fail2ban.server.jailthread import JailThread
+from .datedetector import DateDetector
-from fail2ban.server.datedetector import DateDetector
+from .datetemplate import DatePatternRegex, DateISO8601, DateEpoch, DateTai64n
-from fail2ban.server.datetemplate import DatePatternRegex, DateISO8601, DateEpoch, DateTai64n
+from .mytime import MyTime
-from fail2ban.server.mytime import MyTime
+from .failregex import FailRegex, Regex, RegexException
-from fail2ban.server.failregex import FailRegex, Regex, RegexException
+from .action import CommandAction
-from fail2ban.server.action import CommandAction
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/filtergamin.py

@@ -27,9 +27,9 @@ import time, logging, fcntl
 
 import gamin
 
-from fail2ban.server.failmanager import FailManagerEmpty
+from .failmanager import FailManagerEmpty
-from fail2ban.server.filter import FileFilter
+from .filter import FileFilter
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/filterpoll.py

@@ -26,9 +26,9 @@ __license__ = "GPL"
 
 import time, logging, os
 
-from fail2ban.server.failmanager import FailManagerEmpty
+from .failmanager import FailManagerEmpty
-from fail2ban.server.filter import FileFilter
+from .filter import FileFilter
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/filterpyinotify.py

@@ -27,9 +27,9 @@ import time, logging, pyinotify
 from distutils.version import LooseVersion
 from os.path import dirname, sep as pathsep
 
-from fail2ban.server.failmanager import FailManagerEmpty
+from .failmanager import FailManagerEmpty
-from fail2ban.server.filter import FileFilter
+from .filter import FileFilter
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 
 if not hasattr(pyinotify, '__version__') \

fail2ban/server/filtersystemd.py

@@ -29,9 +29,9 @@ from systemd import journal
 if LooseVersion(getattr(journal, '__version__', "0")) < '204':
 	raise ImportError("Fail2Ban requires systemd >= 204")
 
-from fail2ban.server.failmanager import FailManagerEmpty
+from .failmanager import FailManagerEmpty
-from fail2ban.server.filter import JournalFilter
+from .filter import JournalFilter
-from fail2ban.server.mytime import MyTime
+from .mytime import MyTime
 
 
 # Gets the instance of the logger.

fail2ban/server/jail.py

@@ -25,7 +25,7 @@ __license__ = "GPL"
 
 import Queue, logging
 
-from fail2ban.server.actions import Actions
+from .actions import Actions
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/server/jails.py

@@ -23,8 +23,8 @@ __license__ = "GPL"
 
 from threading import Lock
 
-from fail2ban.exceptions import DuplicateJailException, UnknownJailException
+from ..exceptions import DuplicateJailException, UnknownJailException
-from fail2ban.server.jail import Jail
+from .jail import Jail
 
 ##
 # Handles the jails.

fail2ban/server/server.py

@@ -27,14 +27,13 @@ __license__ = "GPL"
 from threading import Lock, RLock
 import logging, logging.handlers, sys, os, signal
 
-from fail2ban.server.jails import Jails
+from .jails import Jails
-from fail2ban.server.filter import FileFilter, JournalFilter
+from .filter import FileFilter, JournalFilter
-from fail2ban.server.transmitter import Transmitter
+from .transmitter import Transmitter
-from fail2ban.server.asyncserver import AsyncServer
+from .asyncserver import AsyncServer, AsyncServerException
-from fail2ban.server.asyncserver import AsyncServerException
+from .database import Fail2BanDb
-from fail2ban.server.database import Fail2BanDb
+from .action import CommandAction
-from fail2ban.server.action import CommandAction
+from .. import version
-from fail2ban import version
 
 # Gets the instance of the logger.
 logSys = logging.getLogger(__name__)

fail2ban/tests/actionstestcase.py

@@ -27,9 +27,9 @@ __license__ = "GPL"
 import unittest, time
 import sys, os, tempfile
 
-from fail2ban.server.actions import Actions
+from ..server.actions import Actions
-from fail2ban.tests.dummyjail import DummyJail
+from .dummyjail import DummyJail
-from fail2ban.tests.utils import LogCaptureTestCase
+from .utils import LogCaptureTestCase
 
 TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
 

fail2ban/tests/actiontestcase.py

@@ -27,9 +27,9 @@ __license__ = "GPL"
 import time
 import logging, sys
 
-from fail2ban.server.action import CommandAction, CallingMap
+from ..server.action import CommandAction, CallingMap
 
-from fail2ban.tests.utils import LogCaptureTestCase
+from .utils import LogCaptureTestCase
 
 class CommandActionTest(LogCaptureTestCase):
 

fail2ban/tests/banmanagertestcase.py

@@ -26,8 +26,8 @@ __license__ = "GPL"
 
 import unittest
 
-from fail2ban.server.banmanager import BanManager
+from ..server.banmanager import BanManager
-from fail2ban.server.ticket import BanTicket
+from ..server.ticket import BanTicket
 
 class AddFailure(unittest.TestCase):
 

fail2ban/tests/clientreadertestcase.py

@@ -23,13 +23,13 @@ __license__ = "GPL"
 
 import os, shutil, sys, tempfile, unittest
 
-from fail2ban.client.configreader import ConfigReader
+from ..client.configreader import ConfigReader
-from fail2ban.client.jailreader import JailReader
+from ..client.jailreader import JailReader
-from fail2ban.client.filterreader import FilterReader
+from ..client.filterreader import FilterReader
-from fail2ban.client.jailsreader import JailsReader
+from ..client.jailsreader import JailsReader
-from fail2ban.client.actionreader import ActionReader
+from ..client.actionreader import ActionReader
-from fail2ban.client.configurator import Configurator
+from ..client.configurator import Configurator
-from fail2ban.tests.utils import LogCaptureTestCase
+from .utils import LogCaptureTestCase
 
 TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
 if os.path.exists('config/fail2ban.conf'):

fail2ban/tests/databasetestcase.py

@@ -28,11 +28,11 @@ import tempfile
 import sqlite3
 import shutil
 
-from fail2ban.server.database import Fail2BanDb
+from ..server.database import Fail2BanDb
-from fail2ban.server.filter import FileContainer
+from ..server.filter import FileContainer
-from fail2ban.server.mytime import MyTime
+from ..server.mytime import MyTime
-from fail2ban.server.ticket import FailTicket
+from ..server.ticket import FailTicket
-from fail2ban.tests.dummyjail import DummyJail
+from .dummyjail import DummyJail
 
 class DatabaseTest(unittest.TestCase):
 

fail2ban/tests/datedetectortestcase.py

@@ -25,10 +25,10 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
 import unittest, calendar, time, datetime, re, pprint
-from fail2ban.server.datedetector import DateDetector
+from ..server.datedetector import DateDetector
-from fail2ban.server.datetemplate import DateTemplate
+from ..server.datetemplate import DateTemplate
-from fail2ban.server.iso8601 import Utc
+from ..server.iso8601 import Utc
-from fail2ban.tests.utils import setUpMyTime, tearDownMyTime
+from .utils import setUpMyTime, tearDownMyTime
 
 class DateDetectorTest(unittest.TestCase):
 

fail2ban/tests/failmanagertestcase.py

@@ -26,8 +26,8 @@ __license__ = "GPL"
 
 import unittest, socket, time, pickle
 
-from fail2ban.server.failmanager import FailManager, FailManagerEmpty
+from ..server.failmanager import FailManager, FailManagerEmpty
-from fail2ban.server.ticket import FailTicket
+from ..server.ticket import FailTicket
 
 class AddFailure(unittest.TestCase):
 

fail2ban/tests/filtertestcase.py

@@ -34,19 +34,16 @@ try:
 except ImportError:
 	journal = None
 
-from fail2ban.server.jail import Jail
+from ..server.jail import Jail
-from fail2ban.server.filterpoll import FilterPoll
+from ..server.filterpoll import FilterPoll
-from fail2ban.server.filter import Filter, FileFilter, DNSUtils
+from ..server.filter import Filter, FileFilter, DNSUtils
-from fail2ban.server.failmanager import FailManager
+from ..server.failmanager import FailManager, FailManagerEmpty
-from fail2ban.server.failmanager import FailManagerEmpty
+from ..server.mytime import MyTime
-from fail2ban.server.mytime import MyTime
+from .utils import setUpMyTime, tearDownMyTime, mtimesleep, LogCaptureTestCase
-from fail2ban.tests.utils import setUpMyTime, tearDownMyTime
+from .dummyjail import DummyJail
-from fail2ban.tests.utils import mtimesleep, LogCaptureTestCase
 
 TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
 
-from fail2ban.tests.dummyjail import DummyJail
-
 # yoh: per Steven Hiscocks's insight while troubleshooting
 # https://github.com/fail2ban/fail2ban/issues/103#issuecomment-15542836
 # adding a sufficiently large buffer might help to guarantee that

fail2ban/tests/misctestcase.py

@@ -28,8 +28,8 @@ import shutil
 
 from glob import glob
 
-from fail2ban.tests.utils import mbasename, TraceBack, FormatterWithTraceBack
+from .utils import mbasename, TraceBack, FormatterWithTraceBack
-from fail2ban.helpers import formatExceptionInfo
+from ..helpers import formatExceptionInfo
 
 class HelpersTest(unittest.TestCase):
 

fail2ban/tests/samplestestcase.py

@@ -30,9 +30,9 @@ else:
 	import simplejson as json
 	next = lambda x: x.next()
 
-from fail2ban.server.filter import Filter
+from ..server.filter import Filter
-from fail2ban.client.filterreader import FilterReader
+from ..client.filterreader import FilterReader
-from fail2ban.tests.utils import setUpMyTime, tearDownMyTime
+from .utils import setUpMyTime, tearDownMyTime
 
 TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files")
 if os.path.exists('config/fail2ban.conf'):

fail2ban/tests/servertestcase.py

@@ -26,11 +26,11 @@ __license__ = "GPL"
 
 import unittest, socket, time, tempfile, os, locale, sys, logging
 
-from fail2ban.server.failregex import Regex, FailRegex, RegexException
+from ..server.failregex import Regex, FailRegex, RegexException
-from fail2ban.server.server import Server, logSys
+from ..server.server import Server, logSys
-from fail2ban.server.jail import Jail
+from ..server.jail import Jail
-from fail2ban.exceptions import UnknownJailException
+from ..exceptions import UnknownJailException
-from fail2ban.tests.utils import LogCaptureTestCase
+from .utils import LogCaptureTestCase
 #from bin.fail2ban-client import Fail2banClient
 try:
 	from fail2ban.server import filtersystemd

fail2ban/tests/sockettestcase.py

@@ -26,8 +26,8 @@ __license__ = "GPL"
 
 import unittest, time, tempfile, os, threading
 
-from fail2ban.server.asyncserver import AsyncServer, AsyncServerException
+from ..server.asyncserver import AsyncServer, AsyncServerException
-from fail2ban.client.csocket import CSocket
+from ..client.csocket import CSocket
 
 class Socket(unittest.TestCase):
 

fail2ban/tests/utils.py

@@ -25,16 +25,9 @@ __license__ = "GPL"
 import logging, os, re, traceback, time, unittest, sys
 from os.path import basename, dirname
 from StringIO import StringIO
+import json
 
-if sys.version_info >= (2, 6):
+from ..server.mytime import MyTime
-	import json
-else:
-	try:
-		import simplejson as json
-	except ImportError:
-		json = None
-
-from fail2ban.server.mytime import MyTime
 
 logSys = logging.getLogger(__name__)
 
@@ -138,19 +131,18 @@ def tearDownMyTime():
 def gatherTests(regexps=None, no_network=False):
 	# Import all the test cases here instead of a module level to
 	# avoid circular imports
-	from fail2ban.tests import banmanagertestcase
+	from . import banmanagertestcase
-	from fail2ban.tests import clientreadertestcase
+	from . import clientreadertestcase
-	from fail2ban.tests import failmanagertestcase
+	from . import failmanagertestcase
-	from fail2ban.tests import filtertestcase
+	from . import filtertestcase
-	from fail2ban.tests import servertestcase
+	from . import servertestcase
-	from fail2ban.tests import datedetectortestcase
+	from . import datedetectortestcase
-	from fail2ban.tests import actiontestcase
+	from . import actiontestcase
-	from fail2ban.tests import actionstestcase
+	from . import actionstestcase
-	from fail2ban.tests import sockettestcase
+	from . import sockettestcase
-	from fail2ban.tests import misctestcase
+	from . import misctestcase
-	from fail2ban.tests import databasetestcase
+	from . import databasetestcase
-	if json:
+	from . import samplestestcase
-		from fail2ban.tests import samplestestcase
 
 	if not regexps: # pragma: no cover
 		tests = unittest.TestSuite()
@@ -207,30 +199,27 @@ def gatherTests(regexps=None, no_network=False):
 
 	# DateDetector
 	tests.addTest(unittest.makeSuite(datedetectortestcase.DateDetectorTest))
-	if json:
+	# Filter Regex tests with sample logs
-		# Filter Regex tests with sample logs
+	tests.addTest(unittest.makeSuite(samplestestcase.FilterSamplesRegex))
-		tests.addTest(unittest.makeSuite(samplestestcase.FilterSamplesRegex))
-	else:
-		logSys.warning("I: Skipping filter samples testing. No simplejson/json module")
 
 	#
 	# Extensive use-tests of different available filters backends
 	#
 
-	from fail2ban.server.filterpoll import FilterPoll
+	from ..server.filterpoll import FilterPoll
 	filters = [FilterPoll]					  # always available
 
 	# Additional filters available only if external modules are available
 	# yoh: Since I do not know better way for parametric tests
 	#      with good old unittest
 	try:
-		from fail2ban.server.filtergamin import FilterGamin
+		from ..server.filtergamin import FilterGamin
 		filters.append(FilterGamin)
 	except Exception, e: # pragma: no cover
 		logSys.warning("Skipping gamin backend testing. Got exception '%s'" % e)
 
 	try:
-		from fail2ban.server.filterpyinotify import FilterPyinotify
+		from ..server.filterpyinotify import FilterPyinotify
 		filters.append(FilterPyinotify)
 	except Exception, e: # pragma: no cover
 		logSys.warning("I: Skipping pyinotify backend testing. Got exception '%s'" % e)
@@ -239,7 +228,7 @@ def gatherTests(regexps=None, no_network=False):
 		tests.addTest(unittest.makeSuite(
 			filtertestcase.get_monitor_failures_testcase(Filter_)))
 	try: # pragma: systemd no cover
-		from fail2ban.server.filtersystemd import FilterSystemd
+		from ..server.filtersystemd import FilterSystemd
 		tests.addTest(unittest.makeSuite(filtertestcase.get_monitor_failures_journal_testcase(FilterSystemd)))
 	except Exception, e: # pragma: no cover
 		logSys.warning("I: Skipping systemd backend testing. Got exception '%s'" % e)