GNOME.org
 

[jhbuild] Use property() decorators everywhere

commit b9d91664f1b01250d7d696a7dba8d4bc2dd5fd0a
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Sep 22 21:42:53 2019 +0200

    Use property() decorators everywhere
    
    In some cases this means removing the original getters or renaming them.
    I've checked that they were not used.

 jhbuild/commands/goalreport.py     |  4 ++--
 jhbuild/modtypes/__init__.py       |  6 +++---
 jhbuild/utils/packagedb.py         |  9 +++++----
 jhbuild/versioncontrol/__init__.py |  8 ++++----
 jhbuild/versioncontrol/bzr.py      | 11 ++++++-----
 jhbuild/versioncontrol/cvs.py      |  4 ++--
 jhbuild/versioncontrol/darcs.py    |  4 ++--
 jhbuild/versioncontrol/fossil.py   |  9 +++------
 jhbuild/versioncontrol/git.py      |  6 +++---
 jhbuild/versioncontrol/hg.py       |  4 ++--
 jhbuild/versioncontrol/mtn.py      |  6 +++---
 jhbuild/versioncontrol/svn.py      |  4 ++--
 jhbuild/versioncontrol/system.py   |  2 +-
 jhbuild/versioncontrol/tarball.py  |  8 ++++----
 tests/mock.py                      |  4 ++--
 15 files changed, 44 insertions(+), 45 deletions(-)
---
diff --git a/jhbuild/commands/goalreport.py b/jhbuild/commands/goalreport.py
index 48e621bb..a944fc49 100644
--- a/jhbuild/commands/goalreport.py
+++ b/jhbuild/commands/goalreport.py
@@ -309,7 +309,8 @@ class FilenamesCheck(Check):
 class DeprecatedSymbolsCheck(SymbolsCheck):
     cached_symbols = {}
 
-    def load_deprecated_symbols(self):
+    @property
+    def symbols(self):
         if self.cached_symbols.get(self.devhelp_filenames):
             return self.cached_symbols.get(self.devhelp_filenames)
         symbols = []
@@ -326,7 +327,6 @@ class DeprecatedSymbolsCheck(SymbolsCheck):
                 symbols.append(name)
         DeprecatedSymbolsCheck.cached_symbols[self.devhelp_filenames] = symbols
         return symbols
-    symbols = property(load_deprecated_symbols)
 
 
 class cmd_goalreport(Command):
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index 16388592..48619f94 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -197,9 +197,9 @@ class Package:
         args = args.replace('${libdir}', libdir)
         return args
 
-    def get_extra_env(self):
+    @property
+    def extra_env(self):
         return self.config.module_extra_env.get(self.name)
-    extra_env = property(get_extra_env)
 
     def get_srcdir(self, buildscript):
         raise NotImplementedError
@@ -362,7 +362,7 @@ them into the prefix."""
             to_delete = set()
             previous_entry = buildscript.moduleset.packagedb.get(self.name)
             if previous_entry:
-                previous_contents = previous_entry.get_manifest()
+                previous_contents = previous_entry.manifest
                 if previous_contents:
                     to_delete.update(fileutils.filter_files_by_prefix(self.config, previous_contents))
 
diff --git a/jhbuild/utils/packagedb.py b/jhbuild/utils/packagedb.py
index 616e3de4..b938c27c 100644
--- a/jhbuild/utils/packagedb.py
+++ b/jhbuild/utils/packagedb.py
@@ -44,7 +44,9 @@ class PackageEntry:
         self.dirname = dirname
 
     _manifest = None
-    def get_manifest(self):
+
+    @property
+    def manifest(self):
         if self._manifest:
             return self._manifest
         if not os.path.exists(os.path.join(self.dirname, 'manifests', self.package)):
@@ -54,7 +56,8 @@ class PackageEntry:
             self._manifest.append(line.strip())
         return self._manifest
 
-    def set_manifest(self, value):
+    @manifest.setter
+    def manifest(self, value):
         if value is None:
             self._manifest = value
             return
@@ -62,8 +65,6 @@ class PackageEntry:
         if len(self._manifest) != len(value):
             logging.error(_('package %s has files with embedded new lines') % self.package)
 
-    manifest = property(get_manifest, set_manifest)
-
     def write(self):
         # write info file
         fileutils.mkdir_with_parents(os.path.join(self.dirname, 'info'))
diff --git a/jhbuild/versioncontrol/__init__.py b/jhbuild/versioncontrol/__init__.py
index b2911bd8..647515fd 100644
--- a/jhbuild/versioncontrol/__init__.py
+++ b/jhbuild/versioncontrol/__init__.py
@@ -79,20 +79,20 @@ class Branch:
         self.checkoutdir = checkoutdir
         self.checkoutroot = self.config.checkoutroot
 
-    def get_checkout_mode(self):
+    @property
+    def checkout_mode(self):
         checkout_mode = self.config.checkout_mode
         return self.config.module_checkout_mode.get(self.module, checkout_mode)
-    checkout_mode = property(get_checkout_mode)
 
+    @property
     def srcdir(self):
         """Return the directory where this branch is checked out."""
         raise NotImplementedError
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         """Return an identifier for this branch or None."""
         raise NotImplementedError
-    branchname = property(branchname)
 
     def exists(self):
         """Return True if branch exists or False if not.
diff --git a/jhbuild/versioncontrol/bzr.py b/jhbuild/versioncontrol/bzr.py
index 2bb05511..eaa3d40b 100644
--- a/jhbuild/versioncontrol/bzr.py
+++ b/jhbuild/versioncontrol/bzr.py
@@ -111,10 +111,12 @@ class BzrBranch(Branch):
         self._revspec = None
         self.revspec = (tag, revspec)
 
-    def get_revspec(self):
+    @property
+    def revspec(self):
         return self._revspec
 
-    def set_revspec(self, value):
+    @revspec.setter
+    def revspec(self, value):
         tag, revspec = value
         if revspec:
             self._revspec = ['-r%s' % revspec]
@@ -125,24 +127,23 @@ class BzrBranch(Branch):
             self._revspec = ['-rdate:%s' % self.config.sticky_date]
         else:
             self._revspec = []
-    revspec = property(get_revspec, set_revspec)
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
         else:
             return os.path.join(self.checkoutroot, self.get_module_basename())
-    srcdir = property(srcdir)
 
     def get_module_basename(self):
         return self.checkoutdir
 
+    @property
     def branchname(self):
         try:
             return get_output(['bzr', 'nick', self.srcdir])
         except CommandError:
             return None
-    branchname = property(branchname)
 
     def exists(self):
         try:
diff --git a/jhbuild/versioncontrol/cvs.py b/jhbuild/versioncontrol/cvs.py
index ad9a46b8..32a743e2 100644
--- a/jhbuild/versioncontrol/cvs.py
+++ b/jhbuild/versioncontrol/cvs.py
@@ -225,16 +225,16 @@ class CVSBranch(Branch):
         self.update_new_dirs = update_new_dirs
         self.override_checkoutdir = override_checkoutdir
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
         else:
             return os.path.join(self.checkoutroot, self.module)
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return self.revision
-    branchname = property(branchname)
 
     def _export(self, buildscript):
         cmd = ['cvs', '-z3', '-q', '-d', self.repository.cvsroot,
diff --git a/jhbuild/versioncontrol/darcs.py b/jhbuild/versioncontrol/darcs.py
index cb173b67..f2fb39d6 100644
--- a/jhbuild/versioncontrol/darcs.py
+++ b/jhbuild/versioncontrol/darcs.py
@@ -60,17 +60,17 @@ class DarcsRepository(Repository):
 class DarcsBranch(Branch):
     """A class representing a Darcs branch."""
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
         else:
             return os.path.join(self.checkoutroot,
                                 os.path.basename(self.module))
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return None
-    branchname = property(branchname)
 
     def _checkout(self, buildscript):
         cmd = ['darcs', 'get', self.module]
diff --git a/jhbuild/versioncontrol/fossil.py b/jhbuild/versioncontrol/fossil.py
index 167b1dbc..4f84109a 100644
--- a/jhbuild/versioncontrol/fossil.py
+++ b/jhbuild/versioncontrol/fossil.py
@@ -58,6 +58,7 @@ class FossilRepository(Repository):
 class FossilBranch(Branch):
     """A class representing a Fossil branch."""
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
@@ -65,19 +66,15 @@ class FossilBranch(Branch):
             return os.path.join(self.checkoutroot,
                                 os.path.basename(self.module))
 
-    srcdir = property(srcdir)
-
+    @property
     def repositoryfile(self):
         return os.path.join(self.checkoutroot,
                             os.path.basename(self.checkoutdir)  + '.fossil')
 
-    repositoryfile = property(repositoryfile)
-
+    @property
     def branchname(self):
         return None
 
-    branchname = property(branchname)
-
     def _checkout(self, buildscript):
         if self.config.sticky_date:
             raise FatalError(_('date based checkout not yet supported\n'))
diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index 580baa1a..5ad51c70 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -152,6 +152,7 @@ class GitBranch(Branch):
             name = name[:-4]
         return name
  
+    @property
     def srcdir(self):
         path_elements = [self.checkoutroot]
         if self.checkoutdir:
@@ -161,11 +162,10 @@ class GitBranch(Branch):
         if self.subdir:
             path_elements.append(self.subdir)
         return os.path.join(*path_elements)
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return self.branch
-    branchname = property(branchname)
 
     def execute_git_predicate(self, predicate):
         """A git command wrapper for the cases, where only the boolean outcome
@@ -678,12 +678,12 @@ class GitCvsBranch(GitBranch):
     def may_checkout(self, buildscript):
         return Branch.may_checkout(self, buildscript)
 
+    @property
     def branchname(self):
         for b in ['remotes/' + str(self.branch), self.branch, 'trunk', 'master']:
             if self.branch_exist(b):
                 return b
         raise
-    branchname = property(branchname)
 
     def _checkout(self, buildscript, copydir=None):
 
diff --git a/jhbuild/versioncontrol/hg.py b/jhbuild/versioncontrol/hg.py
index 5982b9a7..a9406ca7 100644
--- a/jhbuild/versioncontrol/hg.py
+++ b/jhbuild/versioncontrol/hg.py
@@ -67,17 +67,17 @@ class HgRepository(Repository):
 class HgBranch(Branch):
     """A class representing a Mercurial branch."""
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
         else:
             return os.path.join(self.checkoutroot,
                                 os.path.basename(self.module))
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return None
-    branchname = property(branchname)
 
     def _checkout(self, buildscript):
         cmd = ['hg', 'clone', self.module]
diff --git a/jhbuild/versioncontrol/mtn.py b/jhbuild/versioncontrol/mtn.py
index abf93f01..0239b3fc 100644
--- a/jhbuild/versioncontrol/mtn.py
+++ b/jhbuild/versioncontrol/mtn.py
@@ -67,6 +67,7 @@ class MonotoneBranch(Branch):
         self.branch = branch
         self.mtn_module = module
 
+    @property
     def _codir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
@@ -74,18 +75,17 @@ class MonotoneBranch(Branch):
             return os.path.join(self.checkoutroot, self.branch)
         else:
             return os.path.join(self.checkoutroot, self.name)
-    _codir = property(_codir)
 
+    @property
     def srcdir(self):
         if self.mtn_module:
             return os.path.join(self._codir, self.mtn_module)
         else:
             return self._codir
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return self.branch
-    branchname = property(branchname)
 
     def _init(self, buildscript):
         """Initializes the monotone database"""
diff --git a/jhbuild/versioncontrol/svn.py b/jhbuild/versioncontrol/svn.py
index c903f25f..53bd4cbf 100644
--- a/jhbuild/versioncontrol/svn.py
+++ b/jhbuild/versioncontrol/svn.py
@@ -191,17 +191,17 @@ class SubversionBranch(Branch):
         self.module_name = module_name
         self.revision = revision
 
+    @property
     def srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
         else:
             return os.path.join(self.checkoutroot,
                                 os.path.basename(self.module))
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return self.revision
-    branchname = property(branchname)
 
     def exists(self):
         try:
diff --git a/jhbuild/versioncontrol/system.py b/jhbuild/versioncontrol/system.py
index 8b4469c3..12060830 100644
--- a/jhbuild/versioncontrol/system.py
+++ b/jhbuild/versioncontrol/system.py
@@ -37,9 +37,9 @@ class SystemBranch(Branch):
         Branch.__init__(self, repository, module = None, checkoutdir = None)
         self.version = version
 
+    @property
     def branchname(self):
         return self.version
-    branchname = property(branchname)
 
     def to_sxml(self):
         return ([sxml.branch(module=self.module,
diff --git a/jhbuild/versioncontrol/tarball.py b/jhbuild/versioncontrol/tarball.py
index 6fc2445e..861cc900 100644
--- a/jhbuild/versioncontrol/tarball.py
+++ b/jhbuild/versioncontrol/tarball.py
@@ -123,6 +123,7 @@ class TarballBranch(Branch):
         self.source_subdir = source_subdir
         self.tarball_name = tarball_name
 
+    @property
     def _local_tarball(self):
         if self.tarball_name:
             return os.path.join(self.config.tarballdir, self.tarball_name)
@@ -131,8 +132,8 @@ class TarballBranch(Branch):
             raise FatalError(_('URL has no filename component: %s') % self.module)
         localfile = os.path.join(self.config.tarballdir, basename)
         return localfile
-    _local_tarball = property(_local_tarball)
 
+    @property
     def raw_srcdir(self):
         if self.checkoutdir:
             return os.path.join(self.checkoutroot, self.checkoutdir)
@@ -155,17 +156,16 @@ class TarballBranch(Branch):
         if localdir.endswith('.src'):
             localdir = localdir[:-4]
         return localdir
-    raw_srcdir = property(raw_srcdir)
 
+    @property
     def srcdir(self):
         if self.source_subdir:
             return os.path.join(self.raw_srcdir, self.source_subdir)
         return self.raw_srcdir
-    srcdir = property(srcdir)
 
+    @property
     def branchname(self):
         return self.version
-    branchname = property(branchname)
 
     def _check_tarball(self):
         """Check whether the tarball has been downloaded correctly."""
diff --git a/tests/mock.py b/tests/mock.py
index cc4e16c8..82c98832 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -188,13 +188,13 @@ class Branch(jhbuild.versioncontrol.Branch):
     def __init__(self, tmpdir):
         self._tmpdir = tmpdir
 
+    @property
     def srcdir(self):
         return self._tmpdir
-    srcdir = property(srcdir)
 
+    @property
     def checkoutdir(self):
         return self._tmpdir
-    checkoutdir = property(checkoutdir)
 
     def checkout(self, buildscript):
         pass
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]