From 7d4af72dde1d9e8413173628c11534f5ac815ef8 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Wed, 29 Oct 2014 09:42:11 +0000
Subject: [PATCH] Revert "Fix when is 'self' used as a parameter name in
 Python"

This reverts commit a6efdb7999298de6be8c5b4f1fca4ff60ac1fb20.
---
 Examples/test-suite/keyword_rename.i               | 4 ----
 Examples/test-suite/python/keyword_rename_runme.py | 4 +---
 Lib/python/pythonkw.swg                            | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/keyword_rename.i b/Examples/test-suite/keyword_rename.i
index 3a878ae80..46c3338b3 100644
--- a/Examples/test-suite/keyword_rename.i
+++ b/Examples/test-suite/keyword_rename.i
@@ -35,10 +35,6 @@ KW(chan, fallthrough)
 KW(end, function)
 KW(nil,local)
 
-struct Keywords {
-  void selfkw(int self) {}
-};
-
 %}
 
 
diff --git a/Examples/test-suite/python/keyword_rename_runme.py b/Examples/test-suite/python/keyword_rename_runme.py
index f6796db52..5646ce7d6 100644
--- a/Examples/test-suite/python/keyword_rename_runme.py
+++ b/Examples/test-suite/python/keyword_rename_runme.py
@@ -1,6 +1,4 @@
+#!/usr/bin/env python
 import keyword_rename
 keyword_rename._in(1)
 keyword_rename._except(1)
-
-k = keyword_rename.Keywords()
-k.selfkw(123)
diff --git a/Lib/python/pythonkw.swg b/Lib/python/pythonkw.swg
index 2f76a664a..8ad0ef11b 100644
--- a/Lib/python/pythonkw.swg
+++ b/Lib/python/pythonkw.swg
@@ -130,7 +130,7 @@ PYTHONKW(None);
 /* 
    'self' is also a bad Name
 */
-PYTHONKW(self);
+PYTHONBN(self);
 
 #undef PYTHONBN
 #undef PYTHONKW