From 6780dd60f6b1e690e3d6f7f4ab5c60d38b2f75fc Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Mon, 1 Oct 2012 13:25:38 +0900
Subject: [PATCH] - Improved python snippets.

---
 autoload/neosnippet/snippets/python.snip | 48 +++++++++++++++++-------
 doc/neosnippet.txt                       |  1 +
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/autoload/neosnippet/snippets/python.snip b/autoload/neosnippet/snippets/python.snip
index 607c93b..2d7d6bf 100644
--- a/autoload/neosnippet/snippets/python.snip
+++ b/autoload/neosnippet/snippets/python.snip
@@ -1,37 +1,56 @@
 snippet     class
 abbr        class Class(...): ...
+prev_word   '^'
+	class ${1:name}(${2:object}):
+		def __init__(self, ${3}):
+			${0}
+
+snippet     classd
+abbr        class Class(...): "..."
 prev_word   '^'
 	class ${1:name}(${2:object}):
 		"""${3:class documentation}"""
 		def __init__(self, ${4}):
 			"""${5:__init__ documentation}"""
-			${6:pass}
+			${0}
 
 snippet     def
 abbr        def function(...): ...
+prev_word   '^'
+	def ${1:name}(${2}):
+		${0}
+
+snippet     defd
+abbr        def function(...): """..."""
 prev_word   '^'
 	def ${1:name}(${2}):
 		"""${3:function documentation}"""
-		${4:pass}
+		${0}
 
 snippet     defm
 abbr        def method(self, ...): ...
+prev_word   '^'
+	def ${1:name}(self, ${2}):
+		${0}
+
+snippet     defmd
+abbr        def method(self, ...): "..."
 prev_word   '^'
 	def ${1:name}(self, ${2}):
 		"""${3:method documentation}"""
-		${4:pass}
+		${0}
 
 snippet     elif
 abbr        elif ...: ...
 prev_word   '^'
 	elif ${1:condition}:
-		${2:pass}
+		${0}
 
 snippet     else
 abbr        else: ...
 prev_word   '^'
 	else:
-		${1:pass}
+		${0}
 
 snippet     fileidiom
 abbr        f = None try: f = open(...) finally: ...
@@ -39,7 +58,7 @@ prev_word   '^'
 	${1:f} = None
 	try:
 		$1 = open(${2})
-		${3}
+		${0}
 	finally:
 	if $1:
 		$1.close()
@@ -48,38 +67,39 @@ snippet     for
 abbr        for ... in ...: ...
 prev_word   '^'
 	for ${1:value} in ${2:list}:
-		${3:pass}
+		${0}
 
 snippet     if
 abbr        if ...: ...
 prev_word   '^'
 	if ${1:condition}:
-		${2:pass}
+		${0}
 
 snippet     ifmain
 abbr        if __name__ == '__main__': ...
 prev_word   '^'
 	if __name__ == '__main__':
-		${1:pass}
+		${0}
 
 snippet     tryexcept
 abbr        try: ... except ...: ...
 prev_word   '^'
 	try:
-		${1:pass}
+		${1}
 	except ${2:ExceptionClass}:
-		${3:pass}
+		${3}
 
 snippet     tryfinally
 abbr        try: ... finally: ...
 prev_word   '^'
 	try:
-		${1:pass}
+		${1}
 	finally:
-		${2:pass}
+		${2}
 
 snippet     while
 abbr        while ...: ...
 prev_word   '^'
 	while ${1:condition}:
-		${2:pass}
+		${0}
+
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index aad96d4..865dedd 100644
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -392,6 +392,7 @@ CHANGELOG			*neosnippet-changelog*
 
 2012-10-01
 - Deleted neosnippet#force_expandable().
+- Improved python snippets.
 
 2012-09-30
 - Changed runtime directory.