summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2014-05-07 09:09:01 -0400
committerYaroslav Halchenko <debian@onerussian.com>2014-05-07 09:09:01 -0400
commit3471f13a84dd38d63439b61a5bc51b492f4ecf7c (patch)
treeaf7e4b9dae58b23c8f9352e71c53ee3ed6aef453 /bin
parent3eabf4a7bd310dab132a4c9d15970c082cfaef22 (diff)
parent6a740f684a52f4ccc310e75d17b18ec610c70bb0 (diff)
downloadfail2ban-3471f13a84dd38d63439b61a5bc51b492f4ecf7c.tar.gz
Merge pull request #700 from kwirk/format-traceback-to-helpers
ENH: Move traceback formatter to from tests.utils to helpers
Diffstat (limited to 'bin')
-rwxr-xr-xbin/fail2ban-regex2
-rwxr-xr-xbin/fail2ban-testcases3
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
index 974566bc..3a887867 100755
--- a/bin/fail2ban-regex
+++ b/bin/fail2ban-regex
@@ -45,7 +45,7 @@ from fail2ban.client.filterreader import FilterReader
from fail2ban.server.filter import Filter
from fail2ban.server.failregex import RegexException
-from fail2ban.tests.utils import FormatterWithTraceBack
+from fail2ban.helpers import FormatterWithTraceBack
# Gets the instance of the logger.
logSys = logging.getLogger("fail2ban")
diff --git a/bin/fail2ban-testcases b/bin/fail2ban-testcases
index b3bddf1c..0e2fdb4b 100755
--- a/bin/fail2ban-testcases
+++ b/bin/fail2ban-testcases
@@ -34,7 +34,8 @@ if os.path.exists("fail2ban/__init__.py"):
sys.path.insert(0, ".")
from fail2ban.version import version
-from fail2ban.tests.utils import FormatterWithTraceBack, gatherTests
+from fail2ban.tests.utils import gatherTests
+from fail2ban.helpers import FormatterWithTraceBack
from fail2ban.server.mytime import MyTime
from optparse import OptionParser, Option