diff options
| author | Rob Austein <sra@hactrn.net> | 2009-12-21 17:17:55 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-12-21 17:17:55 +0000 |
| commit | 01514ffc034a1d38f965a023f48ae92d0fdefc07 (patch) | |
| tree | 221c0be2301a91645633ee588137642fe803e836 | |
| parent | cba5f61350bc202daeaace764f2c4366f8fcac53 (diff) | |
Have to import "with" statement from future into Python 2.5 to avoid
syntax errors while suppressing MySQLdb set deprecation warnings in
Python 2.6. Feh.
svn path=/rpkid/irdbd.py; revision=2895
| -rw-r--r-- | rpkid/irdbd.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/sql.py | 2 | ||||
| -rw-r--r-- | rpkid/testbed.py | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py index 9facc6aa..26be6f56 100644 --- a/rpkid/irdbd.py +++ b/rpkid/irdbd.py @@ -36,6 +36,8 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ +from __future__ import with_statement + import sys, os, time, getopt, urlparse, warnings import rpki.https, rpki.config, rpki.resource_set, rpki.relaxng import rpki.exceptions, rpki.left_right, rpki.log, rpki.x509 diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py index a3ab9e55..f0082165 100644 --- a/rpkid/rpki/sql.py +++ b/rpkid/rpki/sql.py @@ -32,6 +32,8 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ +from __future__ import with_statement + import warnings # Silence warning while loading MySQLdb in Python 2.6, sigh diff --git a/rpkid/testbed.py b/rpkid/testbed.py index efcbaf5c..3554c577 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -48,6 +48,8 @@ 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.https import rpki.log, rpki.left_right, rpki.config, rpki.publication, rpki.async |