diff options
| author | Rob Austein <sra@hactrn.net> | 2012-11-15 22:13:53 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-11-15 22:13:53 +0000 |
| commit | 756fdbe0d7eda1e98663c62bb3e57f2c18e88ee1 (patch) | |
| tree | c0af81a5987e9859d12a0323d0d240f58d8b2f36 /rpkid/rpki/mysql_import.py | |
| parent | 713507be1695d8f2f278ab925d58defc58eff2aa (diff) | |
| parent | 11f3b8df179a16ebe1446dab620522ac97e3c327 (diff) | |
Merge tk274 performance work back to trunk. Closes #274.
svn path=/trunk/; revision=4878
Diffstat (limited to 'rpkid/rpki/mysql_import.py')
| -rw-r--r-- | rpkid/rpki/mysql_import.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rpkid/rpki/mysql_import.py b/rpkid/rpki/mysql_import.py index ac2b580d..e7b54dde 100644 --- a/rpkid/rpki/mysql_import.py +++ b/rpkid/rpki/mysql_import.py @@ -16,7 +16,7 @@ object from this module. Looks kind of strange, but seems to work. $Id$ -Copyright (C) 2011 Internet Systems Consortium ("ISC") +Copyright (C) 2011-2012 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 @@ -45,6 +45,8 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ +# pylint: disable=W0611 + from __future__ import with_statement import warnings @@ -59,3 +61,5 @@ else: import _mysql_exceptions warnings.simplefilter("error", _mysql_exceptions.Warning) + +import MySQLdb.converters |