rename s/gnuradio_swig_python/gnuradio_core/g

8 files changed, 10 insertions, 10 deletions

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index f354efe0b..9e0d2f69e 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -29,7 +29,7 @@ CLEANFILES += guile/gnuradio*
 endif
 
 # ----------------------------------------------------------------
-# We've split the previously monstrous gnuradio_swig_python into 6
+# We've split the previously monstrous gnuradio_core into 6
 # smaller pieces.  This reduces compile time coupling and creates
 # smaller pieces for the compiler to digest.  prior to this change, on
 # X86_64, g++'s resident set size was 650MB!
@@ -68,7 +68,7 @@ EXTRA_DIST = gen-swig-bug-fix
 # special install for this top-level Python script which includes all
 # of the split Python libraries.
 ourpythondir = $(grpythondir)/gr
-ourpython_PYTHON = gnuradio_swig_python.py
+ourpython_PYTHON = gnuradio_core.py
 
 # ----------------------------------------------------------------
 # FIXME As of swig 1.3.31, this still seems to be required...
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py b/gnuradio-core/src/lib/swig/gnuradio_core.py
index 8f9fffd5c..172051013 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig_python.py
+++ b/gnuradio-core/src/lib/swig/gnuradio_core.py
@@ -18,7 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-# This file implements the old gnuradio_swig_python namespace
+# This file implements the old gnuradio_core namespace
 
 from gnuradio_core_runtime import *
 from gnuradio_core_general import *
diff --git a/gnuradio-core/src/lib/swig/gnuradio_swig.scm b/gnuradio-core/src/lib/swig/gnuradio_swig.scm
index 961564d68..c07d46a64 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_swig.scm
+++ b/gnuradio-core/src/lib/swig/gnuradio_swig.scm
@@ -3,7 +3,7 @@
 ;;; We'll need to assemble the (gnuradio gr) module somewhere...
 ;;;
 
-;; # This file implements the old gnuradio_swig_python namespace
+;; # This file implements the old gnuradio_core namespace
 ;;
 ;; from gnuradio_swig_py_runtime import *
 ;; from gnuradio_swig_py_general import *
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py
index 6f939c470..73ca8e08f 100644
--- a/gnuradio-core/src/python/gnuradio/gr/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2003,2004,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -40,7 +40,7 @@ if _RTLD_GLOBAL != 0:
     _dlopenflags = sys.getdlopenflags()
     sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
 
-from gnuradio_swig_python import *
+from gnuradio_core import *
 from exceptions import *
 from hier_block2 import *
 from top_block import *
diff --git a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
index b43c5feda..f2256da1b 100644
--- a/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
+++ b/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio_swig_python import hier_block2_swig
+from gnuradio_core import hier_block2_swig
 
 #
 # This hack forces a 'has-a' relationship to look like an 'is-a' one.
diff --git a/gnuradio-core/src/python/gnuradio/gr/prefs.py b/gnuradio-core/src/python/gnuradio/gr/prefs.py
index 9b31b772b..40347a2f4 100644
--- a/gnuradio-core/src/python/gnuradio/gr/prefs.py
+++ b/gnuradio-core/src/python/gnuradio/gr/prefs.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import gnuradio_swig_python as gsp
+import gnuradio_core as gsp
 _prefs_base = gsp.gr_prefs
 
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/scheduler.py b/gnuradio-core/src/python/gnuradio/gr/scheduler.py
index 4694d48b2..67f79ab77 100644
--- a/gnuradio-core/src/python/gnuradio/gr/scheduler.py
+++ b/gnuradio-core/src/python/gnuradio/gr/scheduler.py
@@ -20,7 +20,7 @@
 # 
 
 from gnuradio.gr.exceptions import *
-from gnuradio_swig_python import single_threaded_scheduler, sts_pyrun
+from gnuradio_core import single_threaded_scheduler, sts_pyrun
 import gr_threading as _threading
 #import threading as _threading
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/top_block.py b/gnuradio-core/src/python/gnuradio/gr/top_block.py
index 71e401424..59bb0438f 100644
--- a/gnuradio-core/src/python/gnuradio/gr/top_block.py
+++ b/gnuradio-core/src/python/gnuradio/gr/top_block.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio_swig_python import top_block_swig, \
+from gnuradio_core import top_block_swig, \
     top_block_wait_unlocked, top_block_run_unlocked
 
 #import gnuradio.gr.gr_threading as _threading