reverse-merged the python-mode snippet directory, will forward merge the trunk again

snippets/text-mode/python-mode/class

@@ -36,8 +36,7 @@ class ${1:ClassName}(${2:object}):
              indent)))
         }
         ${4:$
-        (let* ((indent (concat "\n" (make-string (current-column) 32)))
+        (mapconcat
-              (self-vars (mapconcat
          '(lambda (x)
             (if (not (string= (nth 0 x) ""))
                 (concat "self._" (nth 0 x) " = " (nth 0 x))))
@@ -50,9 +49,6 @@ class ${1:ClassName}(${2:object}):
               x))
           (mapcar '(lambda (x) (split-string x "="))
                   (split-string text ",")))
-                   (concat indent))))
+         (concat "\n" (make-string (current-column) 32)))
-  (if (string= self-vars "")
-      indent
-    self-vars))        
         }
         $0

snippets/text-mode/python-mode/def

@@ -6,6 +6,29 @@
 def ${1:name}($2):
     """$3
     ${2:$
-    (yas/python-rebuscate)
+    (let* ((indent
+            (concat "\n" (make-string (current-column) 32)))
+           (args
+            (mapconcat
+             '(lambda (x)
+                (if (not (string= (nth 0 x) ""))
+                    (concat "- " (char-to-string 96) (nth 0 x)
+                            (char-to-string 96) ":")))
+             (mapcar
+              '(lambda (x)
+                 (mapcar
+                  '(lambda (x)
+                     (replace-regexp-in-string "[[:blank:]]*$" ""
+                      (replace-regexp-in-string "^[[:blank:]]*" "" x)))
+                  x))
+              (mapcar '(lambda (x) (split-string x "="))
+                      (split-string text ",")))
+             indent)))
+      (if (string= args "")
+          (make-string 3 34)
+        (mapconcat
+         'identity
+         (list "" "Arguments:" args (make-string 3 34))
+         indent)))
     }
     $0

snippets/text-mode/python-mode/prop

@@ -1,15 +0,0 @@
-# contributor: Mads D. Kristensen <madsdk@gmail.com>
-# name: prop
-# --
-def ${1:foo}():
-   doc = """${2:Doc string}"""
-   def fget(self):
-       return self._$1
-   def fset(self, value):
-       self._$1 = value
-   def fdel(self):
-       del self._$1
-   return locals()
-$1 = property(**$1())
-
-$0