[gentoo-commits] proj/R_overlay:master commit in: roverlay/

[André Erdmann]

commit:     eecacfa624c9c07a6d5fab9b2867cf201599b869
Author:     Andre Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 30 16:07:34 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 30 16:07:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=eecacfa6

remove @classmethod decorators
	modified:   ebuild.py
	modified:   ebuildcreator.py
	modified:   ebuildjob.py

---
 roverlay/ebuild.py        |    7 -------
 roverlay/ebuildcreator.py |   15 ++++++---------
 roverlay/ebuildjob.py     |   14 ++++----------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/roverlay/ebuild.py b/roverlay/ebuild.py
index 6316495..df2d028 100644
--- a/roverlay/ebuild.py
+++ b/roverlay/ebuild.py
@@ -6,7 +6,6 @@ class Ebuild:
 	# could move this to const
 	EBUILD_INDENT = "\t"
 
-	@classmethod
 	def __init__ ( self ):
 		"""Initializes an Ebuild.
 		This is an abstraction layer between the verified + calculated data
@@ -20,7 +19,6 @@ class Ebuild:
 
 	# --- end of __init__ (...) ---
 
-	@classmethod
 	def cleanup ( self ):
 		"""Removes stored data if ebuild_lines have already been calculated.
 		This saves some memory but makes this Ebuild read-only.
@@ -31,7 +29,6 @@ class Ebuild:
 
 	# --- end of cleanup (...) ---
 
-	@classmethod
 	def prepare ( self, force_update=False, cleanup_after=False ):
 		"""Tells this Ebuild to create ebuild lines.
 
@@ -59,7 +56,6 @@ class Ebuild:
 
 	# --- end of prepare (...) ---
 
-	@classmethod
 	def add ( self, key, value, append=True ):
 		"""Adds data to this Ebuild.
 
@@ -90,7 +86,6 @@ class Ebuild:
 
 	# --- end of add (...) ---
 
-	@classmethod
 	def write ( self, file_to_write ):
 		"""Writes an ebuild file.
 
@@ -115,7 +110,6 @@ class Ebuild:
 
 	# --- end of write (...) ---
 
-	@classmethod
 	def show ( self, file_handle ):
 		"""Prints the ebuild content into a file_handle.
 
@@ -154,7 +148,6 @@ class Ebuild:
 
 	# --- end of suggest_name (...) ---
 
-	@classmethod
 	def _make_ebuild_lines ( self ):
 		"""Creates text lines for this Ebuild.
 		It assumes that enough data to do this are available. Exceptions (KeyError, NameError, ...)

diff --git a/roverlay/ebuildcreator.py b/roverlay/ebuildcreator.py
index 54a1c6a..bc74490 100644
--- a/roverlay/ebuildcreator.py
+++ b/roverlay/ebuildcreator.py
@@ -6,9 +6,6 @@ from roverlay.ebuildjob import EbuildJob
 
 class EbuildCreator:
 
-
-
-	@classmethod
 	def __init__ ( self ):
 		"""Initializes an EbuildCreator. This is an Object that controls the
 		R package -> ebuild creation. It continuously creates EbuildJobs for
@@ -20,8 +17,6 @@ class EbuildCreator:
 
 	# --- end of init (...) ---
 
-
-	@classmethod
 	def add_package ( self, package_file ):
 		"""Adds an R package to the EbuildCreator, which means that an EbuildJob
 		will be created for it. Returns the EbuildJob, which is also stored
@@ -30,6 +25,7 @@ class EbuildCreator:
 		arguments:
 		* package_file -- path R package file
 		"""
+
 		new_job = EbuildJob ( package_file, self.get_resolver ( False ) )
 
 		self.ebuild_jobs.append ( new_job )
@@ -38,7 +34,6 @@ class EbuildCreator:
 
 	# --- end of add_package (...) ---
 
-	@classmethod
 	def get_resolver ( self, readonly=True ):
 		"""Returns a communication channel to the dependency resolver.
 
@@ -52,19 +47,21 @@ class EbuildCreator:
 
 	# --- end of get_resolver (...) ---
 
-	@classmethod
 	def run ( self ):
 		"""Tells all EbuildJobs to run."""
 		for job in self.ebuild_jobs:
 			job.run()
 
-	@classmethod
+	# --- end of run (...) ---
+
 	def collect_ebuilds ( self ):
 		"""Returns all ebuilds. (They may not be ready / TODO)"""
 		ebuilds = [ job.get_ebuild() for job in self.ebuild_jobs ]
 		return [ ebuild for ebuild in ebuilds if (not ebuild is None) ]
 
-	@classmethod
+	# --- end of collect_ebuilds (...) ---
+
+
 	def get_ebuild_header ( self, ebuild_header_file=None ):
 		"""Reads and returns the content of an ebuild header file.
 		This is a normal file that can be included in ebuilds.

diff --git a/roverlay/ebuildjob.py b/roverlay/ebuildjob.py
index d45dfdf..2767497 100644
--- a/roverlay/ebuildjob.py
+++ b/roverlay/ebuildjob.py
@@ -28,7 +28,6 @@ class EbuildJob:
 		FAIL         = [],
 	)
 
-	@classmethod
 	def __init__ ( self, package_file, dep_resolver=None ):
 		"""Initializes an EbuildJob, which creates an ebuild for an R package.
 
@@ -53,7 +52,6 @@ class EbuildJob:
 
 	# --- end of __init__ (...) ---
 
-	@classmethod
 	def get_ebuild ( self ):
 		"""Returns the Ebuild that is created by this object. Note that you should
 		check the status with status ( $TODO::EBUILD_READY ) before trying to use
@@ -64,7 +62,6 @@ class EbuildJob:
 
 	# --- end of get_ebuild (...) ---
 
-	@classmethod
 	def get_status ( self, expected_status=None ):
 		"""Returns the current status of this job or a bool that indicates
 		whether to current status matches the expected one.
@@ -79,7 +76,6 @@ class EbuildJob:
 
 	# --- end of get_status (...) ---
 
-	@classmethod
 	def done_success ( self ):
 		"""Returns True if this has been successfully finished."""
 		return get_status ( 'SUCCESS' )
@@ -87,7 +83,6 @@ class EbuildJob:
 	# --- end of done_success (...) ---
 
 
-	@classmethod
 	def run ( self ):
 		"""Tells this EbuildJob to run. This means that it reads the package file,
 		resolves dependencies using its resolver (TODO) and creates
@@ -125,7 +120,8 @@ class EbuildJob:
 
 
 			# origin is todo (sync module knows the package origin)
-			ebuild.add ( 'PKG_ORIGIN', 'CRAN' )
+			ebuild.add ( 'PKG_ORIGIN', 'CRAN/BIOC/... TODO!' )
+			ebuild.add ( 'SRC_URI', 'where? TODO!' )
 
 			ebuild.add ( 'PKG_FILE', fileinfo ['package_file'] )
 
@@ -206,9 +202,8 @@ class EbuildJob:
 			## finalize self.ebuild: forced text creation + make it readonly
 			if ebuild.prepare ( True, True ):
 				self.ebuild = ebuild
-				return None
-			else:
-				return None
+
+			return None
 
 		except Exception as any_exception:
 			# any exception means failure
@@ -217,7 +212,6 @@ class EbuildJob:
 
 	# --- end of run (...) ---
 
-	@classmethod
 	def _set_status ( self, new_status, ignore_invalid=False ):
 		"""Changes the status of this job. May refuse to do that if invalid change
 		requested (e.g. 'FAIL' -> 'SUCCESS').