diff options
| -rw-r--r-- | pym/emerge/__init__.py | 4 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 8 | ||||
| -rw-r--r-- | pym/portage/eclass_cache.py | 2 | ||||
| -rw-r--r-- | pym/portage/gpg.py | 2 | ||||
| -rw-r--r-- | pym/portage/output.py | 2 | ||||
| -rw-r--r-- | pym/portage/xpak.py | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index bf6dd5a36..5f0611c43 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -362,7 +362,7 @@ def create_depgraph_params(myopts, myaction): return myparams # search functionality -class search: +class search(object): # # class constants @@ -910,7 +910,7 @@ def show_invalid_depstring_notice(parent_node, depstring, error_msg): f.add_flowing_data(x) f.end_paragraph(1) -class depgraph: +class depgraph(object): pkg_tree_map = { "ebuild":"porttree", diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f5a4893c1..d80a72d51 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -316,7 +316,7 @@ def flatten(mytokens): #beautiful directed graph object -class digraph: +class digraph(object): def __init__(self): """Create an empty digraph""" @@ -818,10 +818,10 @@ def autouse(myvartree, use_cache=1, mysettings=None): return myusevars def check_config_instance(test): - if not test or (str(test.__class__) != 'portage.config'): - raise TypeError, "Invalid type for config object: %s" % test.__class__ + if not isinstance(test, config): + raise TypeError("Invalid type for config object: %s" % test.__class__) -class config: +class config(object): """ This class encompasses the main portage configuration. Data is pulled from ROOT/PORTDIR/profiles/, from ROOT/etc/make.profile incrementally through all diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py index 40d4e360f..5a0d3c3ad 100644 --- a/pym/portage/eclass_cache.py +++ b/pym/portage/eclass_cache.py @@ -7,7 +7,7 @@ from portage.util import normalize_path, writemsg import os, sys from portage.data import portage_gid -class cache: +class cache(object): """ Maintains the cache information about eclasses used in ebuild. """ diff --git a/pym/portage/gpg.py b/pym/portage/gpg.py index 93335e11b..1fdac6252 100644 --- a/pym/portage/gpg.py +++ b/pym/portage/gpg.py @@ -30,7 +30,7 @@ def fileStats(filepath): return mya -class FileChecker: +class FileChecker(object): def __init__(self,keydir=None,keyring=None,requireSignedRing=False,minimumTrust=EXISTS): self.minimumTrust = TRUSTED # Default we require trust. For rings. self.keydir = None diff --git a/pym/portage/output.py b/pym/portage/output.py index 78d0dcfd2..847e5627a 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -286,7 +286,7 @@ def set_term_size(lines, columns, fd): cmd = ["stty", "rows", str(lines), "columns", str(columns)] spawn(cmd, env=os.environ, fd_pipes={0:fd}) -class EOutput: +class EOutput(object): """ Performs fancy terminal formatting for status and informational messages. diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py index b7ef582e8..2a015571c 100644 --- a/pym/portage/xpak.py +++ b/pym/portage/xpak.py @@ -224,7 +224,7 @@ def xpand(myid,mydest): startpos=startpos+namelen+12 os.chdir(origdir) -class tbz2: +class tbz2(object): def __init__(self,myfile): self.file=myfile self.filestat=None |