From ec0670f6d575adecd32cad9add7b70924fe8f72b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 21 Sep 2013 09:44:24 +1000 Subject: [PATCH] BF: fix MyTime imports --- fail2ban/tests/filtertestcase.py | 2 +- fail2ban/tests/samplestestcase.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fail2ban/tests/filtertestcase.py b/fail2ban/tests/filtertestcase.py index d57766e3..b948e33c 100644 --- a/fail2ban/tests/filtertestcase.py +++ b/fail2ban/tests/filtertestcase.py @@ -39,6 +39,7 @@ from fail2ban.server.filterpoll import FilterPoll from fail2ban.server.filter import FileFilter, DNSUtils from fail2ban.server.failmanager import FailManager from fail2ban.server.failmanager import FailManagerEmpty +from fail2ban.server.mytime import MyTime from fail2ban.tests.utils import setUpMyTime, tearDownMyTime TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files") @@ -48,7 +49,6 @@ TEST_FILES_DIR = os.path.join(os.path.dirname(__file__), "files") # from utils import mtimesleep -from server.mytime import MyTime # yoh: per Steven Hiscocks's insight while troubleshooting # https://github.com/fail2ban/fail2ban/issues/103#issuecomment-15542836 diff --git a/fail2ban/tests/samplestestcase.py b/fail2ban/tests/samplestestcase.py index 34f99841..fb3ebbc8 100644 --- a/fail2ban/tests/samplestestcase.py +++ b/fail2ban/tests/samplestestcase.py @@ -23,8 +23,6 @@ __copyright__ = "Copyright (c) 2013 Steven Hiscocks" __license__ = "GPL" import unittest, sys, os, fileinput, re, time, datetime, inspect -from server.mytime import MyTime - if sys.version_info >= (2, 6): import json