15 files changed, 6 insertions, 87 deletions

diff --git a/.emacs.d/snippets/python-mode.statnett/classmethod b/.emacs.d/snippets/python-mode.statnett/classmethod
deleted file mode 100644
index aa78440..0000000
--- a/.emacs.d/snippets/python-mode.statnett/classmethod
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: classmethod
-# key: cm
-# group: object oriented
-# --
-@classmethod
-def ${1:meth}(cls, $2):
-    """
-    """
-    $3
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/cls b/.emacs.d/snippets/python-mode.statnett/cls
deleted file mode 100644
index 3dbd391..0000000
--- a/.emacs.d/snippets/python-mode.statnett/cls
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: cls
-# key: cls
-# group: object oriented
-# --
-class ${1:class}(${2:object}):
-    """"""
-    $0
diff --git a/.emacs.d/snippets/python-mode.statnett/dec b/.emacs.d/snippets/python-mode.statnett/dec
deleted file mode 100644
index b22c9e9..0000000
--- a/.emacs.d/snippets/python-mode.statnett/dec
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: dec
-# key: dec
-# group : definitions
-# --
-def ${1:decorator}(func):
-    $2
-    def _$1(*args, **kwargs):
-        $3
-        ret = func(*args, **kwargs)
-        $4
-        return ret
-
-    return _$1
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/function b/.emacs.d/snippets/python-mode.statnett/function
deleted file mode 100644
index 5a39d8f..0000000
--- a/.emacs.d/snippets/python-mode.statnett/function
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# key: fn
-# group: definitions
-# --
-def ${1:fun}(${2:args}):
-    """"""
-    $0
diff --git a/.emacs.d/snippets/python-mode.statnett/import b/.emacs.d/snippets/python-mode.statnett/import
deleted file mode 100644
index f34bc39..0000000
--- a/.emacs.d/snippets/python-mode.statnett/import
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# key: imp
-# group : general
-# --
-import ${1:lib}${2: as ${3:alias}}
-$0
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/method b/.emacs.d/snippets/python-mode.statnett/method
deleted file mode 100644
index 985ef0c..0000000
--- a/.emacs.d/snippets/python-mode.statnett/method
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: m
-# group: object oriented
-# --
-def ${1:method}(self${2:, $3}):
-    $0
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/not_impl b/.emacs.d/snippets/python-mode.statnett/not_impl
index 515e353..97a6cb0 100644
--- a/.emacs.d/snippets/python-mode.statnett/not_impl
+++ b/.emacs.d/snippets/python-mode.statnett/not_impl
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: not_impl
-# key: not_impl
+# key: ni
 # --
 raise NotImplementedError
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/pass b/.emacs.d/snippets/python-mode.statnett/pass
deleted file mode 100644
index 4734f7f..0000000
--- a/.emacs.d/snippets/python-mode.statnett/pass
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: pass
-# key: ps
-# --
-pass
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/property_getter b/.emacs.d/snippets/python-mode.statnett/property_getter
index 8bb99dd..408428a 100644
--- a/.emacs.d/snippets/python-mode.statnett/property_getter
+++ b/.emacs.d/snippets/python-mode.statnett/property_getter
@@ -7,5 +7,4 @@
 def ${1:name}(self):
     """$1-property"""
     return self.${2:value}
-
-$0
+$0
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/property_setter b/.emacs.d/snippets/python-mode.statnett/property_setter
index a74be67..aa0288d 100644
--- a/.emacs.d/snippets/python-mode.statnett/property_setter
+++ b/.emacs.d/snippets/python-mode.statnett/property_setter
@@ -12,4 +12,4 @@ def ${1:name}(self):
 def $1(self, value):
     """$1-property setter"""
     self.$2 = value
-$0
+$0
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/scls b/.emacs.d/snippets/python-mode.statnett/scls
deleted file mode 100644
index 4a10e28..0000000
--- a/.emacs.d/snippets/python-mode.statnett/scls
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: subclass
-# key: scls
-# group: object oriented
-# --
-class ${1:class}(${2:super-class}):
-    $0
diff --git a/.emacs.d/snippets/python-mode.statnett/script b/.emacs.d/snippets/python-mode.statnett/script
index 3246334..2e8cc35 100644
--- a/.emacs.d/snippets/python-mode.statnett/script
+++ b/.emacs.d/snippets/python-mode.statnett/script
@@ -3,12 +3,12 @@
 # key: script
 # --
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 
 def main(inargs=None):
     """main entry point"""
     $0
 
-
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()
diff --git a/.emacs.d/snippets/python-mode.statnett/selfassign b/.emacs.d/snippets/python-mode.statnett/selfassign
index 95d7b2b..efdfaa0 100644
--- a/.emacs.d/snippets/python-mode.statnett/selfassign
+++ b/.emacs.d/snippets/python-mode.statnett/selfassign
@@ -3,4 +3,4 @@
 # key: sn
 # group: object oriented
 # --
-self.$1 = $1
\ No newline at end of file
+self._$1 = $1
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/while b/.emacs.d/snippets/python-mode.statnett/while
deleted file mode 100644
index 7b3539c..0000000
--- a/.emacs.d/snippets/python-mode.statnett/while
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: while
-# key: wh
-# group: control structure
-# --
-while ${1:True}:
-    $0
\ No newline at end of file
diff --git a/.emacs.d/snippets/python-mode.statnett/with b/.emacs.d/snippets/python-mode.statnett/with
deleted file mode 100644
index 7fcbd38..0000000
--- a/.emacs.d/snippets/python-mode.statnett/with
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: with
-# key: with
-# group : control structure
-# --
-with ${1:expr}${2: as ${3:alias}}:
-    $0
\ No newline at end of file