From b5da408d40a16e7832b3314d308c4ad59681bf49 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Sun, 3 Apr 2022 07:32:40 +0200
Subject: [PATCH 1/5] Upgrade snippets to Python3 (using ' instead of ")

---
 init.lua | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/init.lua b/init.lua
index 58a64b1..89914d7 100644
--- a/init.lua
+++ b/init.lua
@@ -134,21 +134,28 @@ end
 local snip = snippets.python
 snip['.'] = 'self.'
 snip.__ = '__%1(init)__'
-snip.def = 'def %1(name)(%2(arg)):\n\t%3("""%4\n\t"""\n\t)'
-snip.defs = 'def %1(name)(self%2(, %3(arg))):\n\t%4("""%5\n\t"""\n\t)'
-snip.ifmain = 'if __name__ == "__main__":\n\t%1(main())'
+snip.def = [[def %1(name)(%2(arg)):
+    %3('''%4''')
+    ]]
+snip.defs = [[def %1(name)(self%2(, %3(arg))):
+    %4('''%5''')
+    ]]
+snip.ifmain = [[
+if __name__ == '__main__':
+    %1(main())
+]]
 snip.class = [[
-class %1(ClassName)(%2(object)):
-"""%3(documentation)
-"""
-def __init__(self%4(, %5(arg))):
-	%6(super(%1, self).__init__())]]
+class %1(ClassName)%2((%3(object))):
+    %4('''%5(documentation)''')
+    def __init__(self%6(, %7(arg))):
+        %8(super(%1, self).__init__())
+    ]]
 snip.try = [[
 try:
-	%0
-except %2(Exception), %3(e):
-	%4(pass)%5(
+    %0
+except %2(Exception) as %3(e):
+    %4(pass)%5(
 finally:
-	%6(pass))]]
+    %6(pass))]]
 
 return M

From 00f57d2009d02e2575517cac36e599dba8111f48 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 4 Apr 2022 07:17:46 +0200
Subject: [PATCH 2/5] cleanup try

---
 init.lua | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/init.lua b/init.lua
index 22062f7..d05b1d6 100644
--- a/init.lua
+++ b/init.lua
@@ -143,12 +143,6 @@ class %1(ClassName)(%2(object)):
 	'''
 	def __init__(self%4(, %5(arg))):
 		%6(super(%1, self).__init__())]]
-snip.try = [[
-try:
-	%0
-except %2(Exception) as %3(e):
-	%4(pass)%5(
-finally:
-    %6(pass))]]
+snip.try = "try:\n\t%0\nexcept %2(Exception) as %3(e):\n\t%4(pass)%5(\nfinally:\n\t%6(pass))"
 
 return M

From 144630c3a2a410f218b256d834807db9c7eeadf4 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Mon, 4 Apr 2022 07:22:23 +0200
Subject: [PATCH 3/5] Comments: let user decide if single or multi-line

---
 init.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/init.lua b/init.lua
index d05b1d6..c800fa7 100644
--- a/init.lua
+++ b/init.lua
@@ -134,13 +134,13 @@ end
 local snip = snippets.python
 snip['.'] = 'self.'
 snip.__ = '__%1(init)__'
-snip.def = "def %1(name)(%2(arg)):\n\t%3('''%4\n\t'''\n\t)"
-snip.defs = "def %1(name)(self%2(, %3(arg))):\n\t%4('''%5\n\t'''\n\t)"
+snip.def = "def %1(name)(%2(arg)):\n\t%3('''%4'''\n\t)"
+snip.defs = "def %1(name)(self%2(, %3(arg))):\n\t%4('''%5'''\n\t)"
 snip.ifmain = "if __name__ == '__main__':\n\t%1(main())"
 snip.class = [[
 class %1(ClassName)(%2(object)):
-	'''%3(documentation)
-	'''
+	'''%3(documentation)'''
+
 	def __init__(self%4(, %5(arg))):
 		%6(super(%1, self).__init__())]]
 snip.try = "try:\n\t%0\nexcept %2(Exception) as %3(e):\n\t%4(pass)%5(\nfinally:\n\t%6(pass))"

From f4fe14d4f87c0b30be2f9133fc85191fc651e70f Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Tue, 17 May 2022 10:08:25 +0200
Subject: [PATCH 4/5] Cleanup snippets, using strings

---
 init.lua | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/init.lua b/init.lua
index 2378fcc..7f7ddc4 100644
--- a/init.lua
+++ b/init.lua
@@ -134,29 +134,18 @@ end
 local snip = snippets.python
 snip['.'] = 'self.'
 snip.__ = '__%1(init)__'
-snip.def = [[
-def %1(name)(%2(arg)):
-	%3('''%4'''
-	)]]
-snip.defs = [[
-def %1(name)(self%2(, %3(arg))):
-	%4('''%5'''
-	)]]
-snip.ifmain = [[
-if __name__ == '__main__':
-	%1(main())]]
-snip.class = [[
-class %1(ClassName)%2((%3(object))):
-	%4('''%5(documentation)'''
-
-	)def __init__(self%6(, %7(arg))):
-		%8(super(%1, self).__init__())]]
-snip.try = [[
-try:
-	%0
-except %2(Exception) as %3(e):
-	%4(pass)%5(
-finally:
-	%6(pass))]]
+snip.def = "def %1(name)(%2(self)%3(, %4(arg))):\n" ..
+"\t%5('''%6'''\n" ..
+"\t)\n"
+snip.ifmain = "if __name__ == '__main__':\n" ..
+"\t%1(main())\n"
+snip.class = "class %1(ClassName)%0:\n\t'''%2(documentation)'''\n\n" ..
+"\tdef __init__(self%3(, %4(arg))):\n\t\t%5(super(%1, self).__init__())n"
+snip.try = "try:\n" ..
+"\t%0\n"..
+"except %2(Exception) as %3(e):\n" ..
+"\t%4(pass)%5(\n" ..
+"finally:\n" ..
+"\t%6(pass))\n"
 
 return M

From c5f296e7ff7d1d5f0a8a7d8fc589ac54ebf22a37 Mon Sep 17 00:00:00 2001
From: "Pedro A. Aranda Gutierrez" <paaguti@gmail.com>
Date: Wed, 18 May 2022 08:11:35 +0200
Subject: [PATCH 5/5] Make longer snippets use table.concat()

---
 init.lua | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/init.lua b/init.lua
index 7f7ddc4..4618872 100644
--- a/init.lua
+++ b/init.lua
@@ -134,18 +134,27 @@ end
 local snip = snippets.python
 snip['.'] = 'self.'
 snip.__ = '__%1(init)__'
-snip.def = "def %1(name)(%2(self)%3(, %4(arg))):\n" ..
-"\t%5('''%6'''\n" ..
-"\t)\n"
+snip.def = table.concat({
+  "def %1(name)(%2(self%3(, ))%4(arg)):",
+  "\t%5('''%6(doc)''')",
+  "",
+  "\t%0"
+}, '\n')
 snip.ifmain = "if __name__ == '__main__':\n" ..
 "\t%1(main())\n"
-snip.class = "class %1(ClassName)%0:\n\t'''%2(documentation)'''\n\n" ..
-"\tdef __init__(self%3(, %4(arg))):\n\t\t%5(super(%1, self).__init__())n"
-snip.try = "try:\n" ..
-"\t%0\n"..
-"except %2(Exception) as %3(e):\n" ..
-"\t%4(pass)%5(\n" ..
-"finally:\n" ..
-"\t%6(pass))\n"
-
+snip.class = table.concat({
+  "class %1(ClassName)%2((%3(object))):",
+  "\t%4('''%5(doc)'''",
+  "",
+  "\t)def __init__(self%6(, %7(arg))):",
+  "\t\t%8(super(%1, self).__init__())"
+}, '\n')
+snip.try = table.concat({
+  "try:",
+  "\t%0",
+  "except %2(Exception) as %3(e):",
+  "\t%4(pass)%5(",
+  "finally:",
+  "\t%6(pass))"
+}, '\n')
 return M