use our custom WidgetWrap everywhere

subiquity/ui/mount.py

@@ -1,9 +1,17 @@
 
 import re
 
-from urwid import connect_signal, Padding, Text, WidgetWrap
+from urwid import (
+    connect_signal,
+    Padding,
+    Text,
+    )
 
-from subiquitycore.ui.container import Columns, Pile
+from subiquitycore.ui.container import (
+    Columns,
+    Pile,
+    WidgetWrap,
+    )
 from subiquitycore.ui.form import FormField
 from subiquitycore.ui.interactive import Selector, StringEditor
 

subiquity/ui/views/identity.py

@@ -21,7 +21,6 @@ from urwid import (
     LineBox,
     Pile,
     Text,
-    WidgetWrap,
     )
 
 from subiquitycore.ui.buttons import (
@@ -31,6 +30,7 @@ from subiquitycore.ui.buttons import (
     )
 from subiquitycore.ui.container import (
     ListBox,
+    WidgetWrap,
     )
 from subiquitycore.ui.interactive import (
     PasswordEditor,

subiquity/ui/views/keyboard.py

@@ -19,7 +19,6 @@ from urwid import (
     connect_signal,
     LineBox,
     Text,
-    WidgetWrap,
     )
 
 from subiquitycore.ui.buttons import (
@@ -30,6 +29,7 @@ from subiquitycore.ui.buttons import (
 from subiquitycore.ui.container import (
     Columns,
     Pile,
+    WidgetWrap,
     )
 from subiquitycore.ui.form import (
     ChoiceField,

subiquitycore/ui/actionmenu.py

@@ -22,11 +22,14 @@ from urwid import (
     PopUpLauncher,
     SelectableIcon,
     Text,
-    WidgetWrap,
     Widget,
     )
 
-from subiquitycore.ui.container import Columns, ListBox
+from subiquitycore.ui.container import (
+    Columns,
+    ListBox,
+    WidgetWrap,
+)
 from subiquitycore.ui.selector import Option
 from subiquitycore.ui.utils import Color
 

subiquitycore/ui/anchors.py

@@ -13,7 +13,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from urwid import WidgetWrap, Pile, Text, ProgressBar
+from urwid import (
+    Text,
+    ProgressBar,
+    )
+from subiquitycore.ui.container import (
+    Pile,
+    WidgetWrap,
+    )
 from subiquitycore.ui.utils import Padding, Color
 
 

subiquitycore/ui/form.py

@@ -24,10 +24,12 @@ from urwid import (
     MetaSignals,
     Text,
     WidgetDecoration,
-    WidgetWrap,
     )
 
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import (
+    WidgetWrap,
+)
 from subiquitycore.ui.interactive import (
     PasswordEditor,
     IntegerEditor,

subiquitycore/ui/frame.py

@@ -18,10 +18,12 @@
 from urwid import (
     Frame,
     Text,
-    WidgetWrap,
     )
 from subiquitycore.ui.anchors import Header, Footer
-from subiquitycore.ui.container import ListBox
+from subiquitycore.ui.container import (
+    ListBox,
+    WidgetWrap,
+    )
 from subiquitycore.ui.utils import Color
 import logging
 

subiquitycore/ui/interactive.py

@@ -23,9 +23,11 @@ import re
 from urwid import (
     Edit,
     IntEdit,
-    WidgetWrap,
     )
 
+from subiquitycore.ui.container import (
+    WidgetWrap,
+    )
 from subiquitycore.ui.selector import Selector
 
 log = logging.getLogger("subiquitycore.ui.input")

subiquitycore/ui/selector.py

@@ -21,10 +21,12 @@ from urwid import (
     PopUpLauncher,
     SelectableIcon,
     Text,
-    WidgetWrap,
     )
 
-from subiquitycore.ui.container import ListBox
+from subiquitycore.ui.container import (
+    ListBox,
+    WidgetWrap,
+    )
 
 
 class _PopUpButton(SelectableIcon):

subiquitycore/ui/views/network.py

@@ -26,12 +26,16 @@ from urwid import (
     LineBox,
     ProgressBar,
     Text,
-    WidgetWrap,
     )
 from urwid import Padding as uPadding
 
 from subiquitycore.ui.buttons import back_btn, cancel_btn, done_btn, menu_btn
-from subiquitycore.ui.container import Columns, ListBox, Pile
+from subiquitycore.ui.container import (
+    Columns,
+    ListBox,
+    Pile,
+    WidgetWrap,
+    )
 from subiquitycore.ui.utils import button_pile, Color, Padding
 from subiquitycore.view import BaseView
 

subiquitycore/ui/views/network_configure_wlan_interface.py

@@ -3,11 +3,15 @@ from urwid import (
     connect_signal,
     LineBox,
     Text,
-    WidgetWrap,
     )
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, menu_btn
-from subiquitycore.ui.container import Columns, ListBox, Pile
+from subiquitycore.ui.container import (
+    Columns,
+    ListBox,
+    Pile,
+    WidgetWrap,
+    )
 from subiquitycore.ui.form import Form, PasswordField, StringField
 from subiquitycore.ui.utils import Color, Padding
 import logging

subiquitycore/view.py

@@ -18,9 +18,14 @@
 Contains some default key navigations
 """
 
-from subiquitycore.ui.stretchy import StretchyOverlay
+from urwid import Overlay, Text
 
-from urwid import Columns, Overlay, Pile, Text, WidgetWrap
+from subiquitycore.ui.container import (
+    Columns,
+    Pile,
+    WidgetWrap,
+    )
+from subiquitycore.ui.stretchy import StretchyOverlay
 
 
 class BaseView(WidgetWrap):