public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 04/13] lint: convert funcs to @staticmethod where it makes sense
Date: Tue,  6 Oct 2015 11:05:20 -0400	[thread overview]
Message-ID: <1444143929-26705-4-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1444143929-26705-1-git-send-email-vapier@gentoo.org>

These functions don't actually utilize |self|, so make them into
@staticmethod's to quiet down the linter.
---
 catalyst/base/stagebase.py   | 3 ++-
 catalyst/lock.py             | 9 ++++++---
 catalyst/targets/snapshot.py | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b9dd1d5..409fcab 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1695,7 +1695,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
 				self.unbind()
 				raise CatalystError("build aborting due to livecd_update error.")
 
-	def _debug_pause_(self):
+	@staticmethod
+	def _debug_pause_():
 		py_input("press any key to continue: ")
 
 # vim: ts=4 sw=4 sta et sts=4 ai
diff --git a/catalyst/lock.py b/catalyst/lock.py
index 71918d6..01b1aa8 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -320,7 +320,8 @@ class LockDir(object):
 			del self.hardlock_paths[self.lockdir]
 			print self.hardlock_paths
 
-	def hardlock_name(self, path):
+	@staticmethod
+	def hardlock_name(path):
 		mypath=path+"/.hardlock-"+os.uname()[1]+"-"+str(os.getpid())
 		newpath = os.path.normpath(mypath)
 		if len(newpath) > 1:
@@ -328,7 +329,8 @@ class LockDir(object):
 				newpath = "/"+newpath.lstrip("/")
 		return newpath
 
-	def hardlink_is_mine(self,link,lock):
+	@staticmethod
+	def hardlink_is_mine(link, lock):
 		import stat
 		try:
 			myhls = os.stat(link)
@@ -347,7 +349,8 @@ class LockDir(object):
 				return True
 		return False
 
-	def hardlink_active(self, lock):
+	@staticmethod
+	def hardlink_active(lock):
 		if not os.path.exists(lock):
 			return False
 
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index 87340b7..a117a21 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -90,7 +90,8 @@ class snapshot(TargetBase, GenBase):
 	def kill_chroot_pids(self):
 		pass
 
-	def cleanup(self):
+	@staticmethod
+	def cleanup():
 		print "Cleaning up..."
 
 	def purge(self):
-- 
2.5.2



  parent reply	other threads:[~2015-10-06 15:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06 15:05 [gentoo-catalyst] [PATCH 01/13] lint: fix duplicate fcntl import Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 02/13] lint: unwrap multiple statements Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 03/13] lint: fix bad indentation Mike Frysinger
2015-10-06 15:05 ` Mike Frysinger [this message]
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 05/13] lint: clean up bare exception handling Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 06/13] lint: avoid relative imports Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 07/13] fileops: fix passing of gid/uid/minimal args Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 08/13] lint: revise wildcard import Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 09/13] lint: mark unused func args Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 10/13] lint: init all members in __init__ Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 11/13] version: use the passed in value Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 12/13] targets: fix bad set_build_kernel_vars call Mike Frysinger
2015-10-06 15:05 ` [gentoo-catalyst] [PATCH 13/13] lint: clean up superfluous parens Mike Frysinger
2015-10-06 15:27   ` Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444143929-26705-4-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox