diff options
| author | Rob Austein <sra@hactrn.net> | 2011-07-27 18:21:45 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-07-27 18:21:45 +0000 |
| commit | 4a739a155b00e582435d7906840f58282ebf8f7d (patch) | |
| tree | f85fff06b273a81ed4b231cf08dceccf53dc2352 /scripts/convert-https-to-http.py | |
| parent | b961465c1d695dd510b00d9c734a169ef6fc0598 (diff) | |
Consolidate all of the import voodoo for MySQLdb into a new module.
svn path=/buildtools/make-python-executable.py; revision=3946
Diffstat (limited to 'scripts/convert-https-to-http.py')
| -rw-r--r-- | scripts/convert-https-to-http.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/convert-https-to-http.py b/scripts/convert-https-to-http.py index 821255c6..94f5ad5c 100644 --- a/scripts/convert-https-to-http.py +++ b/scripts/convert-https-to-http.py @@ -10,7 +10,7 @@ Default configuration file is myrpki.conf, override with --config option. $Id$ -Copyright (C) 2010 Internet Systems Consortium ("ISC") +Copyright (C) 2010-2011 Internet Systems Consortium ("ISC") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -25,8 +25,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -from __future__ import with_statement - import getopt, sys, os, warnings, lxml.etree, rpki.config cfg_file = "myrpki.conf" @@ -91,12 +89,7 @@ for root, dirs, files in os.walk(entitydb_dir): if convert_sql: - if hasattr(warnings, "catch_warnings"): - with warnings.catch_warnings(): - warnings.simplefilter("ignore", DeprecationWarning) - import MySQLdb - else: - import MySQLdb + from rpki.mysql_import import MySQLdb cfg = rpki.config.parser(cfg_file, "myrpki") |