diff options
Diffstat (limited to 'rpkid/tests/smoketest.py')
| -rw-r--r-- | rpkid/tests/smoketest.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index 38e0d110..7ee6f4af 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -46,19 +46,11 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -from __future__ import with_statement - import os, yaml, warnings, subprocess, signal, time, getopt, sys import rpki.resource_set, rpki.sundial, rpki.x509, rpki.http import rpki.log, rpki.left_right, rpki.config, rpki.publication, rpki.async -# Silence warning while loading MySQLdb in Python 2.6, sigh -if hasattr(warnings, "catch_warnings"): - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - import MySQLdb -else: - import MySQLdb +from rpki.mysql_import import MySQLdb os.environ["TZ"] = "UTC" time.tzset() |