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 /rpkid/rpki-sql-setup.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 'rpkid/rpki-sql-setup.py')
| -rw-r--r-- | rpkid/rpki-sql-setup.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/rpkid/rpki-sql-setup.py b/rpkid/rpki-sql-setup.py index dc463620..a7fb2d25 100644 --- a/rpkid/rpki-sql-setup.py +++ b/rpkid/rpki-sql-setup.py @@ -19,21 +19,9 @@ 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, getopt, sys, rpki.config, getpass, warnings -# 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 - -import _mysql_exceptions - -warnings.simplefilter("error", _mysql_exceptions.Warning) +from rpki.mysql_import import MySQLdb schema_dir = os.path.normpath(sys.path[0]) |