[Commit-gnuradio] r7603 - in gnuradio/branches/developers/eb/fg-no-more: config gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/gr

[eb]

Author: eb
Date: 2008-02-07 17:18:38 -0700 (Thu, 07 Feb 2008)
New Revision: 7603

Removed:
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/blks/
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/blksimpl/
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/flow_graph.py
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/hier_block.py
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_basic_flow_graph.py
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_flow_graph.py
Modified:
   gnuradio/branches/developers/eb/fg-no-more/config/grc_gnuradio_core.m4
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/Makefile.am
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/Makefile.am
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/__init__.py
   
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
Log:
gr.flow_graph and friends removed.  Passes make check.


Modified: gnuradio/branches/developers/eb/fg-no-more/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/fg-no-more/config/grc_gnuradio_core.m4      
2008-02-07 23:12:04 UTC (rev 7602)
+++ gnuradio/branches/developers/eb/fg-no-more/config/grc_gnuradio_core.m4      
2008-02-08 00:18:38 UTC (rev 7603)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software 
Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -43,8 +43,6 @@
         gnuradio-core/src/python/Makefile \
         gnuradio-core/src/python/bin/Makefile \
         gnuradio-core/src/python/gnuradio/Makefile \
-        gnuradio-core/src/python/gnuradio/blks/Makefile \
-        gnuradio-core/src/python/gnuradio/blksimpl/Makefile \
         gnuradio-core/src/python/gnuradio/blks2/Makefile \
         gnuradio-core/src/python/gnuradio/blks2impl/Makefile \
         gnuradio-core/src/python/gnuradio/gr/Makefile \

Modified: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/Makefile.am
    2008-02-07 23:12:04 UTC (rev 7602)
+++ 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/Makefile.am
    2008-02-08 00:18:38 UTC (rev 7603)
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2007 Free Software Foundation, Inc.
+# Copyright 2004,2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = gr gru gruimpl blks blksimpl blks2 blks2impl vocoder
+SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
 
 grpython_PYTHON =                      \
        __init__.py                     \

Modified: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/Makefile.am
 2008-02-07 23:12:04 UTC (rev 7602)
+++ 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/Makefile.am
 2008-02-08 00:18:38 UTC (rev 7603)
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,13 +32,10 @@
 
 grgrpython_PYTHON =            \
        __init__.py             \
-       basic_flow_graph.py     \
        exceptions.py           \
-       flow_graph.py           \
        gr_threading.py         \
        gr_threading_23.py      \
        gr_threading_24.py      \
-       hier_block.py           \
        hier_block2.py          \
        prefs.py                \
        scheduler.py            \
@@ -50,7 +47,6 @@
        qa_add_v_and_friends.py         \
        qa_agc.py                       \
        qa_argmax.py                    \
-       qa_basic_flow_graph.py          \
        qa_bin_statistics.py            \
        qa_cma_equalizer.py             \
        qa_complex_to_xxx.py            \
@@ -62,7 +58,6 @@
        qa_feval.py                     \
        qa_fft_filter.py                \
        qa_filter_delay_fc.py           \
-       qa_flow_graph.py                \
        qa_fractional_interpolator.py   \
        qa_frequency_modulator.py       \
        qa_fsk_stuff.py                 \

Modified: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/__init__.py
===================================================================
--- 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/__init__.py
 2008-02-07 23:12:04 UTC (rev 7602)
+++ 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/__init__.py
 2008-02-08 00:18:38 UTC (rev 7603)
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004,2006 Free Software Foundation, Inc.
+# Copyright 2003,2004,2006,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -40,10 +40,7 @@
 sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
 
 from gnuradio_swig_python import *
-from basic_flow_graph import *
-from flow_graph import *
 from exceptions import *
-from hier_block import *
 from hier_block2 import *
 from top_block import *
 

Deleted: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/basic_flow_graph.py

Deleted: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/flow_graph.py

Deleted: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/hier_block.py

Deleted: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_basic_flow_graph.py

Deleted: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_flow_graph.py

Modified: 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
===================================================================
--- 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
       2008-02-07 23:12:04 UTC (rev 7602)
+++ 
gnuradio/branches/developers/eb/fg-no-more/gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
       2008-02-08 00:18:38 UTC (rev 7603)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -32,7 +32,7 @@
 
     def test_blks_import(self):
         # make sure that this somewhat magic import works
-        from gnuradio import blks
+        from gnuradio import blks2
 
     def test_gru_import(self):
         # make sure that this somewhat magic import works