From 519c3514d2d06247245140abcf8fed24d81cbc0c Mon Sep 17 00:00:00 2001
From: capitaomorte <joaotavora@gmail.com>
Date: Wed, 22 Jul 2009 10:38:44 +0000
Subject: [PATCH] reverse-merged the python-mode snippet directory, will
 forward merge the trunk again

---
 snippets/text-mode/python-mode/class | 32 ++++++++++++----------------
 snippets/text-mode/python-mode/def   | 25 +++++++++++++++++++++-
 snippets/text-mode/python-mode/prop  | 15 -------------
 3 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 snippets/text-mode/python-mode/prop

diff --git a/snippets/text-mode/python-mode/class b/snippets/text-mode/python-mode/class
index 9617c07..72f339b 100644
--- a/snippets/text-mode/python-mode/class
+++ b/snippets/text-mode/python-mode/class
@@ -36,23 +36,19 @@ class ${1:ClassName}(${2:object}):
              indent)))
         }
         ${4:$
-        (let* ((indent (concat "\n" (make-string (current-column) 32)))
-              (self-vars (mapconcat
-                   '(lambda (x)
-                      (if (not (string= (nth 0 x) ""))
-                          (concat "self._" (nth 0 x) " = " (nth 0 x))))
-                   (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 ",")))
-                   (concat indent))))
-  (if (string= self-vars "")
-      indent
-    self-vars))        
+        (mapconcat
+         '(lambda (x)
+            (if (not (string= (nth 0 x) ""))
+                (concat "self._" (nth 0 x) " = " (nth 0 x))))
+         (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 ",")))
+         (concat "\n" (make-string (current-column) 32)))
         }
         $0
diff --git a/snippets/text-mode/python-mode/def b/snippets/text-mode/python-mode/def
index 6898dd6..1ea3aa5 100644
--- a/snippets/text-mode/python-mode/def
+++ b/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
diff --git a/snippets/text-mode/python-mode/prop b/snippets/text-mode/python-mode/prop
deleted file mode 100644
index 107730a..0000000
--- a/snippets/text-mode/python-mode/prop
+++ /dev/null
@@ -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