From a6efdb7999298de6be8c5b4f1fca4ff60ac1fb20 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 28 Oct 2014 06:59:30 +0000
Subject: [PATCH] Fix when is 'self' used as a parameter name in Python

Fix corner case for variable names called 'self' after merging in patch #201
---
 Examples/test-suite/keyword_rename.i               | 4 ++++
 Examples/test-suite/python/keyword_rename_runme.py | 4 +++-
 Lib/python/pythonkw.swg                            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/keyword_rename.i b/Examples/test-suite/keyword_rename.i
index 46c3338b3..3a878ae80 100644
--- a/Examples/test-suite/keyword_rename.i
+++ b/Examples/test-suite/keyword_rename.i
@@ -35,6 +35,10 @@ 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 5646ce7d6..f6796db52 100644
--- a/Examples/test-suite/python/keyword_rename_runme.py
+++ b/Examples/test-suite/python/keyword_rename_runme.py
@@ -1,4 +1,6 @@
-#!/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 8ad0ef11b..2f76a664a 100644
--- a/Lib/python/pythonkw.swg
+++ b/Lib/python/pythonkw.swg
@@ -130,7 +130,7 @@ PYTHONKW(None);
 /* 
    'self' is also a bad Name
 */
-PYTHONBN(self);
+PYTHONKW(self);
 
 #undef PYTHONBN
 #undef PYTHONKW