Merged r10288:10370 from michaelld/swigpythonargs into trunk. Passes distcheck.

[debian/gnuradio] / gr-usrp / src / usrp.i

diff --git a/gr-usrp/src/usrp.i b/gr-usrp/src/usrp.i
index 40fa471b01c9c1da3433976c99f5006663ff2f0d..b60ef70cd84f8c24c393781def0aa8784a90ba1a 100644 (file)
--- a/gr-usrp/src/usrp.i
+++ b/gr-usrp/src/usrp.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,12 +22,10 @@
 
 %feature("autodoc", "1");              // generate python docstrings
 
-%include "exception.i"
-%import "gnuradio.i"                           // the common stuff
+%import(module="gnuradio_swig_py_runtime") "gnuradio.i"        // the common stuff
 
 %{
 #include "gnuradio_swig_bug_workaround.h"      // mandatory bug fix
-#include <stdexcept>
 #include <vector>
 %}