[Pkg-python-debian-commits] r64 trunk: - remove useless getFoo methods: the should have been hidden for the beginning and since they are just proxy for properties the latter can be easily implemented via lambda-s

[Stefano Zacchiroli]

------------------------------------------------------------
revno: 64
committer: Stefano Zacchiroli <zack at bononia.it>
branch nick: pkg-python-debian
timestamp: Wed 2007-07-18 16:50:22 +0200
message:
  - remove useless getFoo methods: the should have been hidden for the beginning and since they are just proxy for properties the latter can be easily implemented via lambda-s
  - add docstrings describing some (read-only) properties
modified:
  debian_bundle/arfile.py
  debian_bundle/debfile.py
-------------- next part --------------
=== modified file 'debian_bundle/arfile.py'
--- a/debian_bundle/arfile.py	2007-07-15 14:47:13 +0000
+++ b/debian_bundle/arfile.py	2007-07-18 14:50:22 +0000
@@ -28,7 +28,11 @@
     """ Representation of an ar archive, see man 1 ar.
     
     The interface of this class tries to mimick that of the TarFile module in
-    the standard library. """
+    the standard library.
+    
+    ArFile objects have the following (read-only) properties:
+        - members       same as getmembers()
+    """
 
     def __init__(self, filename=None, mode='r', fileobj=None):
         """ Build an ar file representation starting from either a filename or
@@ -60,10 +64,10 @@
                 break
             self.__members.append(newmember)
             self.__members_dict[newmember.name] = newmember
-            if newmember.getsize() % 2 == 0: # even, no padding
-                fp.seek(newmember.getsize(), 1) # skip to next header
+            if newmember.size % 2 == 0: # even, no padding
+                fp.seek(newmember.size, 1) # skip to next header
             else:
-                fp.seek(newmember.getsize() + 1 , 1) # skip to next header
+                fp.seek(newmember.size + 1 , 1) # skip to next header
         
         if self.__fname:
             fp.close()
@@ -133,7 +137,16 @@
     """ Member of an ar archive.
 
     Implements most of a file object interface: read, readline, next,
-    readlines, seek, tell, close. """
+    readlines, seek, tell, close.
+    
+    ArMember objects have the following (read-only) properties:
+        - name      member name in an ar archive
+        - mtime     modification time
+        - owner     owner user
+        - group     owner group
+        - fmode     file permissions
+        - size      size in bytes
+        - fname     file name"""
 
     def __init__(self):
         self.__name = None      # member name (i.e. filename) in the archive
@@ -286,26 +299,13 @@
 
         return iter(nextline())
 
-    def getname(self): return self.__name
-    name = property(getname)
-
-    def getmtime(self): return self.__mtime
-    mtime = property(getmtime)
-
-    def getowner(self): return self.__owner
-    owner = property(getowner)
-
-    def getgroup(self): return self.__group
-    group = property(getgroup)
-
-    def getfmode(self): return self.__fmode
-    fmode = property(getfmode)
-
-    def getsize(self): return self.__size
-    size = property(getsize)
-
-    def getfname(self): return self.__fname
-    fname = property(getsize)
+    name = property(lambda self: self.__name)
+    mtime = property(lambda self: self.__mtime)
+    owner = property(lambda self: self.__owner)
+    group = property(lambda self: self.__group)
+    fmode = property(lambda self: self.__fmode)
+    size = property(lambda self: self.__size)
+    fname = property(lambda self: self.__fname)
 
 if __name__ == '__main__':
     # test

=== modified file 'debian_bundle/debfile.py'
--- a/debian_bundle/debfile.py	2007-07-14 22:25:00 +0000
+++ b/debian_bundle/debfile.py	2007-07-18 14:50:22 +0000
@@ -133,6 +133,17 @@
         return sums
 
 class DebFile(ArFile):
+    """Representation of a .deb file (a Debian binary package)
+
+    DebFile objects have the following (read-only) properties:
+        - version       debian .deb file format version (not related with the
+                        contained package version), 2.0 at the time of writing
+                        for all .deb packages in the Debian archive
+        - data          DebPart object corresponding to the data.tar.gz
+                        archive contained in the .deb file
+        - control       DebPart object corresponding to the control.tar.gz
+                        archive contained in the .deb file
+    """
 
     def __init__(self, filename=None, mode='r', fileobj=None):
         ArFile.__init__(self, filename, mode, fileobj)
@@ -151,14 +162,9 @@
     def __updatePkgName(self):
         self.__pkgname = self.debcontrol()['package']
 
-    def getVersion(self): return self.__version
-    version = property(getVersion)
-
-    def getData(self): return self.__parts[DATA_PART]
-    data = property(getData)
-
-    def getCtrl(self): return self.__parts[CTRL_PART]
-    control = property(getCtrl)
+    version = property(lambda self: self.__version)
+    data = property(lambda self: self.__parts[DATA_PART])
+    control = property(lambda self: self.__parts[CTRL_PART])
 
     # proxy methods for the appropriate parts