diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 15:02:39 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-27 20:59:58 -0400 |
commit | c07cc475cbafec24e747d6907f3bf7257e441934 (patch) | |
tree | fee9fec976c1b18eaddb17a027350ff908286847 /src/lib/Bcfg2/Client | |
parent | a9a7ba9da3c67766bf27f462bd4d32c0dd2caa6c (diff) | |
download | bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.gz bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.bz2 bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.zip |
renamed Bcfg2Py3k to Compat
Diffstat (limited to 'src/lib/Bcfg2/Client')
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/File.py | 2 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index 52d4e6a3f..31d3a1971 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -2,7 +2,7 @@ import Bcfg2.Client.Tools from Bcfg2.Client.Frame import matches_white_list, passes_black_list -from Bcfg2.Bcfg2Py3k import input +from Bcfg2.Compat import input """ <Action timing='pre|post|both' diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py index 26550078e..95a3e5ddf 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py @@ -9,7 +9,7 @@ try: except ImportError: # py3k, incompatible syntax with py2.4 exec("from .base import POSIXTool") -from Bcfg2.Bcfg2Py3k import unicode, b64encode, b64decode +from Bcfg2.Compat import unicode, b64encode, b64decode class POSIXFile(POSIXTool): __req__ = ['name', 'perms', 'owner', 'group'] diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index 026c7ade0..b38eca739 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -7,7 +7,7 @@ import pkgutil from subprocess import Popen, PIPE import Bcfg2.Client.XML -from Bcfg2.Bcfg2Py3k import input +from Bcfg2.Compat import input if hasattr(pkgutil, 'walk_packages'): submodules = pkgutil.walk_packages(path=__path__) |