From 98a3b4d3eb2732675d2556b04cdf047534676b2d Mon Sep 17 00:00:00 2001
From: Mesalu <samuel@mesalu.com>
Date: Tue, 31 Jul 2018 15:01:46 -0700
Subject: [PATCH 1/5] Update config.py

---
 etg/config.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/etg/config.py b/etg/config.py
index 5ecf55bc..80cad558 100644
--- a/etg/config.py
+++ b/etg/config.py
@@ -56,11 +56,20 @@ def run():
         else:
             func.find('defaultVal').default = 'wxEmptyString'
 
-    c.addCppMethod('long', 'ReadInt', '(const wxString& key, long defaultVal=0)',  """\
+    c.addCppMethod('long', '__cpp_ReadInt', '(const wxString& key, long defaultVal=0)',  """\
         long rv;
         self->Read(*key, &rv, defaultVal);
         return rv;
         """)
+    c.addPyMethod('ReadInt', '(self, key, defaultVal=0)', 
+                  body="""\
+                  import six
+                  rv = self.__cpp_ReadInt(key, defaultVal)
+                  if six.PY2:
+                      rv = int(rv)
+                  return rv
+                  """)
+           
     c.addCppMethod('double', 'ReadFloat', '(const wxString& key, double defaultVal=0.0)', """\
         double rv;
         self->Read(*key, &rv, defaultVal);

From 2b73f16101b7682c07ac5276f42e30a673d5f413 Mon Sep 17 00:00:00 2001
From: Mesalu <samuel@mesalu.com>
Date: Tue, 31 Jul 2018 15:03:53 -0700
Subject: [PATCH 2/5] Update config.py

Fix styling
---
 etg/config.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/etg/config.py b/etg/config.py
index 80cad558..ced0b016 100644
--- a/etg/config.py
+++ b/etg/config.py
@@ -61,14 +61,13 @@ def run():
         self->Read(*key, &rv, defaultVal);
         return rv;
         """)
-    c.addPyMethod('ReadInt', '(self, key, defaultVal=0)', 
-                  body="""\
-                  import six
-                  rv = self.__cpp_ReadInt(key, defaultVal)
-                  if six.PY2:
-                      rv = int(rv)
-                  return rv
-                  """)
+    c.addPyMethod('ReadInt', '(self, key, defaultVal=0)', body="""\
+        import six
+        rv = self.__cpp_ReadInt(key, defaultVal)
+        if six.PY2:
+            rv = int(rv)
+            return rv
+        """)
            
     c.addCppMethod('double', 'ReadFloat', '(const wxString& key, double defaultVal=0.0)', """\
         double rv;

From 9c004273c8610079677ca5a81fb192dc2fec5476 Mon Sep 17 00:00:00 2001
From: Mesalu <samuel@mesalu.com>
Date: Tue, 31 Jul 2018 15:17:58 -0700
Subject: [PATCH 3/5] Update config.py

Switch to single underscore instead of double.
---
 etg/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etg/config.py b/etg/config.py
index ced0b016..e662015a 100644
--- a/etg/config.py
+++ b/etg/config.py
@@ -56,14 +56,14 @@ def run():
         else:
             func.find('defaultVal').default = 'wxEmptyString'
 
-    c.addCppMethod('long', '__cpp_ReadInt', '(const wxString& key, long defaultVal=0)',  """\
+    c.addCppMethod('long', '_cpp_ReadInt', '(const wxString& key, long defaultVal=0)',  """\
         long rv;
         self->Read(*key, &rv, defaultVal);
         return rv;
         """)
     c.addPyMethod('ReadInt', '(self, key, defaultVal=0)', body="""\
         import six
-        rv = self.__cpp_ReadInt(key, defaultVal)
+        rv = self._cpp_ReadInt(key, defaultVal)
         if six.PY2:
             rv = int(rv)
             return rv

From 0bded60eb24dfe602402fd505d675a8f64c9b78e Mon Sep 17 00:00:00 2001
From: Mesalu <samuel@mesalu.com>
Date: Tue, 31 Jul 2018 21:50:05 -0700
Subject: [PATCH 4/5] Fix indentation

---
 etg/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etg/config.py b/etg/config.py
index e662015a..8675e751 100644
--- a/etg/config.py
+++ b/etg/config.py
@@ -66,9 +66,9 @@ def run():
         rv = self._cpp_ReadInt(key, defaultVal)
         if six.PY2:
             rv = int(rv)
-            return rv
+        return rv
         """)
-           
+
     c.addCppMethod('double', 'ReadFloat', '(const wxString& key, double defaultVal=0.0)', """\
         double rv;
         self->Read(*key, &rv, defaultVal);

From a75b88ed946d28ff553d2fa628ed8e6f86d25c90 Mon Sep 17 00:00:00 2001
From: Mesalu <samuel@mesalu.com>
Date: Wed, 1 Aug 2018 18:06:53 -0700
Subject: [PATCH 5/5] Add note to changelog

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7c008210..1c4f325f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -59,7 +59,7 @@ Changes in this release include the following:
 
 * Add flag to hide page in wx.lib.agw.aui.notebook. (#895)
 
-
+* Add a step to wx.Config.ReadInt to attempt converting from long to int under python2. (#384)
 
 
 4.0.3 "The show must go on. (Die show-stoppers! Die!)"