summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/python
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-17 19:57:51 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-17 19:57:51 -0500
commitf0bcceb462fda30371d83babb254e991f73f237e (patch)
tree22402536b6dde1fd7b71aeea10edf496f3049063 /gnuradio-core/src/python
parent01f42b51ed910480ac6463ec9221718e848b82d6 (diff)
parent3643a858e3f4e52fc9c9a3310f779a9f77ed308e (diff)
Merge branch 'cpp_prefs'
Diffstat (limited to 'gnuradio-core/src/python')
-rw-r--r--gnuradio-core/src/python/gnuradio/gr/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py
index f1b971e62d..1c2c4c8371 100644
--- a/gnuradio-core/src/python/gnuradio/gr/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py
@@ -36,7 +36,7 @@ serial_to_parallel = stream_to_vector
parallel_to_serial = vector_to_stream
# Force the preference database to be initialized
-from prefs import prefs
+prefs = gr_prefs.singleton
#alias old gr_add_vXX and gr_multiply_vXX
add_vcc = add_cc