summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-27 15:02:39 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-27 20:59:58 -0400
commitc07cc475cbafec24e747d6907f3bf7257e441934 (patch)
treefee9fec976c1b18eaddb17a027350ff908286847 /tools
parenta9a7ba9da3c67766bf27f462bd4d32c0dd2caa6c (diff)
downloadbcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.gz
bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.bz2
bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.zip
renamed Bcfg2Py3k to Compat
Diffstat (limited to 'tools')
-rw-r--r--tools/create-debian-pkglist-gp.py6
-rwxr-xr-xtools/create-debian-pkglist.py6
-rwxr-xr-xtools/pkgmgr_gen.py2
-rwxr-xr-xtools/pkgmgr_update.py2
-rwxr-xr-xtools/upgrade/1.2/packages-convert.py2
-rwxr-xr-xtools/upgrade/1.3/migrate_configs.py2
6 files changed, 10 insertions, 10 deletions
diff --git a/tools/create-debian-pkglist-gp.py b/tools/create-debian-pkglist-gp.py
index cefb8f3fb..91c087e54 100644
--- a/tools/create-debian-pkglist-gp.py
+++ b/tools/create-debian-pkglist-gp.py
@@ -10,9 +10,9 @@ import sys
import subprocess
# Compatibility imports
-from Bcfg2.Bcfg2Py3k import StringIO
-from Bcfg2.Bcfg2Py3k import ConfigParser
-from Bcfg2.Bcfg2Py3k import urlopen
+from Bcfg2.Compat import StringIO
+from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import urlopen
def debug(msg):
'''print debug messages'''
diff --git a/tools/create-debian-pkglist.py b/tools/create-debian-pkglist.py
index 4b268c6ee..7dce2b340 100755
--- a/tools/create-debian-pkglist.py
+++ b/tools/create-debian-pkglist.py
@@ -11,9 +11,9 @@ import re
import sys
# Compatibility imports
-from Bcfg2.Bcfg2Py3k import StringIO
-from Bcfg2.Bcfg2Py3k import ConfigParser
-from Bcfg2.Bcfg2Py3k import urlopen
+from Bcfg2.Compat import StringIO
+from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import urlopen
apt_pkg.init()
diff --git a/tools/pkgmgr_gen.py b/tools/pkgmgr_gen.py
index 7101ba17d..51387abf0 100755
--- a/tools/pkgmgr_gen.py
+++ b/tools/pkgmgr_gen.py
@@ -23,7 +23,7 @@ import xml.sax
from xml.sax.handler import ContentHandler
# Compatibility imports
-from Bcfg2.Bcfg2Py3k import urljoin
+from Bcfg2.Compat import urljoin
def info(object, spacing=10, collapse=1):
diff --git a/tools/pkgmgr_update.py b/tools/pkgmgr_update.py
index 05d645786..a4d25ec46 100755
--- a/tools/pkgmgr_update.py
+++ b/tools/pkgmgr_update.py
@@ -22,7 +22,7 @@ import rpm
import sys
# Compatibility imports
-from Bcfg2.Bcfg2Py3k import urljoin
+from Bcfg2.Compat import urljoin
try:
from lxml.etree import parse, tostring
diff --git a/tools/upgrade/1.2/packages-convert.py b/tools/upgrade/1.2/packages-convert.py
index c7b43279f..d65ce90a2 100755
--- a/tools/upgrade/1.2/packages-convert.py
+++ b/tools/upgrade/1.2/packages-convert.py
@@ -3,7 +3,7 @@
import os
import sys
import lxml.etree
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
import Bcfg2.Options
XI_NAMESPACE = "http://www.w3.org/2001/XInclude"
diff --git a/tools/upgrade/1.3/migrate_configs.py b/tools/upgrade/1.3/migrate_configs.py
index dd8e5708b..b7adb2528 100755
--- a/tools/upgrade/1.3/migrate_configs.py
+++ b/tools/upgrade/1.3/migrate_configs.py
@@ -2,7 +2,7 @@
import os
import sys
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
import Bcfg2.Options
def copy_section(src_file, tgt_cfg, section, newsection=None):