Ensure that __version__ is visible from wxPython/__init__.py

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_core_reverse.txt b/wxPython/src/_core_reverse.txt
index fc8c4eb36241692d97db87540f31490477dee985..0176d97744d56148efbc924bccd8c735a0b5148e 100644 (file)
--- a/wxPython/src/_core_reverse.txt
+++ b/wxPython/src/_core_reverse.txt
@@ -44,4 +44,4 @@ MemoryFSHandler_AddFile
 # given prefix and will put a reference in the local module.
 EVT*
 WXK*
 # given prefix and will put a reference in the local module.
 EVT*
 WXK*

-
+__version__*

diff --git a/wxPython/wxPython/__init__.py b/wxPython/wxPython/__init__.py
index ff5af048a7fc8a84fa8a9e8c85bec39445c2bad7..bf3637fbcb0a4af84816d29626024769fa7a6350 100644 (file)
--- a/wxPython/wxPython/__init__.py
+++ b/wxPython/wxPython/__init__.py
@@ -2,9 +2,9 @@
 
 
 # We need to be able to import from the wx package, but there is also
 
 
 # We need to be able to import from the wx package, but there is also

-# a wxPyton.wx module and that woudl normally be chosen first by
+# a wxPyton.wx module and that would normally be chosen first by

 # import statements.  So instead we'll have a wxPython._wx module and
 # import statements.  So instead we'll have a wxPython._wx module and

-# then stuff it into sys.modules with a wxPython.wx alias so odl
+# then stuff it into sys.modules with a wxPython.wx alias so old

 # programs will still work.
 
 import _wx
 # programs will still work.
 
 import _wx


@@ -12,3 +12,5 @@ import sys
 sys.modules['wxPython.wx'] = _wx
 wx = _wx
 del sys
 sys.modules['wxPython.wx'] = _wx
 wx = _wx
 del sys

+
+from wx import __version__

diff --git a/wxPython/wxPython/_wx.py b/wxPython/wxPython/_wx.py
index 3712b2e8502d531cece59bc5eaab7b81df4087cd..9342b81db225010f1312cfb09ddaf8a962c368e4 100644 (file)
--- a/wxPython/wxPython/_wx.py
+++ b/wxPython/wxPython/_wx.py
@@ -1,6 +1,7 @@
 
 # Load all symbols that should appear in the wxPython.wx namespace
 from core import *
 
 # Load all symbols that should appear in the wxPython.wx namespace
 from core import *

+from core import __version__

 from gdi import *
 from windows import *
 from controls import *
 from gdi import *
 from windows import *
 from controls import *