diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-03-17 15:59:11 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-03-17 15:59:11 -0500 |
| commit | 9f85b8af0ccf2c90aa5d806dd7baefab68237f3a (patch) | |
| tree | 10cd915a5b4d4e052837a5c6bddb7805d17d7855 | |
| parent | ea279b8a9b451214e487197c554fecdd36818d7a (diff) | |
| parent | da597c996e159d3e978562d6b8f67c1c3b98b8dd (diff) | |
| download | bcfg2-9f85b8af0ccf2c90aa5d806dd7baefab68237f3a.tar.gz bcfg2-9f85b8af0ccf2c90aa5d806dd7baefab68237f3a.tar.bz2 bcfg2-9f85b8af0ccf2c90aa5d806dd7baefab68237f3a.zip | |
Merge branch 'remove-python23'
| -rw-r--r-- | src/lib/Client/Tools/RPMng.py | 6 | ||||
| -rw-r--r-- | src/lib/Client/Tools/YUM24.py | 6 | ||||
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 6 | ||||
| -rw-r--r-- | src/lib/Client/Tools/__init__.py | 4 |
4 files changed, 0 insertions, 22 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index 5376118c2..71022b330 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -9,12 +9,6 @@ import Bcfg2.Client.Tools # Compatibility import from Bcfg2.Bcfg2Py3k import ConfigParser -# Fix for python2.3 -try: - set -except NameError: - from sets import Set as set - class RPMng(Bcfg2.Client.Tools.PkgTool): """Support for RPM packages.""" name = 'RPMng' diff --git a/src/lib/Client/Tools/YUM24.py b/src/lib/Client/Tools/YUM24.py index 66768fb34..e6163c6ce 100644 --- a/src/lib/Client/Tools/YUM24.py +++ b/src/lib/Client/Tools/YUM24.py @@ -10,12 +10,6 @@ import Bcfg2.Client.Tools.RPMng # Compatibility import from Bcfg2.Bcfg2Py3k import ConfigParser -# Fix for python2.3 -try: - set -except NameError: - from sets import Set as set - YAD = True CP = ConfigParser.ConfigParser() try: diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 9b999df92..08e6aa10c 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -16,12 +16,6 @@ import Bcfg2.Client.Tools # Compatibility import from Bcfg2.Bcfg2Py3k import ConfigParser -# Fix for python2.3 -try: - set -except NameError: - from sets import Set as set - def build_yname(pkgname, inst): """Build yum appropriate package name.""" diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py index e879d7dd6..b1e35c33c 100644 --- a/src/lib/Client/Tools/__init__.py +++ b/src/lib/Client/Tools/__init__.py @@ -1,8 +1,4 @@ """This contains all Bcfg2 Tool modules""" -# suppress popen2 warnings for python 2.3 -import warnings -warnings.filterwarnings("ignore", "The popen2 module is deprecated.*", - DeprecationWarning) import os import stat import sys |