From b00617cd7b8d1d426877adbd145b9be2939c4a07 Mon Sep 17 00:00:00 2001
From: Valentin Lavrinenko <Valentin.Lavrinenko@gmail.com>
Date: Mon, 20 Jun 2016 01:35:32 +0300
Subject: [PATCH] fix some minor issues to allow MaskedEditControls run,
 including running from demo dir

---
 demo/MaskedEditControls.py  | 5 ++---
 demo/run.py                 | 2 +-
 wx/lib/masked/maskededit.py | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/demo/MaskedEditControls.py b/demo/MaskedEditControls.py
index a2f1bfa7..6e00d6ce 100644
--- a/demo/MaskedEditControls.py
+++ b/demo/MaskedEditControls.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-import string
 import sys
 import traceback
 
@@ -362,7 +361,7 @@ with auto-select:""")
 
 
         numerators = [ str(i) for i in range(1, 4) ]
-        denominators = [ string.ljust(str(i), 2) for i in [2,3,4,5,8,16,32,64] ]
+        denominators = [ str(i).ljust(2) for i in [2,3,4,5,8,16,32,64] ]
         fieldsDict = {0: masked.Field(choices=numerators, choiceRequired=False),
                       1: masked.Field(choices=denominators, choiceRequired=True)}
         choices = []
@@ -632,7 +631,7 @@ def RunStandalone():
     win = TestMaskedTextCtrls(frame, -1, sys.stdout)
     frame.Show(True)
     app.MainLoop()
-    
+
 #----------------------------------------------------------------------------
 import wx.lib.masked.maskededit as maskededit
 # strip out module header used for pydoc:
diff --git a/demo/run.py b/demo/run.py
index c3b867be..5f09d529 100755
--- a/demo/run.py
+++ b/demo/run.py
@@ -149,7 +149,7 @@ def main(argv):
         raise SystemExit
 
     # ensure the CWD is the demo folder
-    demoFolder = os.path.dirname(__file__)
+    demoFolder = os.path.realpath(os.path.dirname(__file__))
     os.chdir(demoFolder)
 
     name, ext  = os.path.splitext(argv[1])
diff --git a/wx/lib/masked/maskededit.py b/wx/lib/masked/maskededit.py
index ebd554ee..ac7c6e71 100644
--- a/wx/lib/masked/maskededit.py
+++ b/wx/lib/masked/maskededit.py
@@ -3073,7 +3073,7 @@ class MaskedEditMixin:
                 else:
                     excludes += field._excludeChars.decode(self._defaultEncoding)
             if not isinstance(self._ctrl_constraints, six.text_type):
-                if six.PY3: 
+                if six.PY3:
                     excludes += field._excludeChars
                 else:
                     excludes += self._ctrl_constraints._excludeChars.decode(self._defaultEncoding)
@@ -4894,7 +4894,7 @@ class MaskedEditMixin:
             except:
                 value = None
 
-            if value < 0 and value is not None:
+            if value is not None and value < 0:
                 signpos = text.find('-')
                 if signpos == -1:
                     signpos = text.find('(')