use new containers everywhere

console_conf/ui/views/identity.py

@@ -15,8 +15,9 @@
 
 import logging
 
-from urwid import (Pile, Columns, Text, ListBox)
+from urwid import Text
 from subiquitycore.ui.buttons import done_btn, cancel_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import EmailEditor
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView

console_conf/ui/views/login.py

@@ -20,9 +20,10 @@ Login provides user with language selection
 """
 import logging
 
-from urwid import (ListBox, Pile, Text)
+from urwid import Text
 
 from subiquitycore.ui.buttons import finish_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

console_conf/ui/views/welcome.py

@@ -19,8 +19,8 @@ Welcome provides user with language selection
 
 """
 import logging
-from urwid import ListBox, Pile
 from subiquitycore.ui.buttons import ok_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquity/ui/views/bcache.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Text, Pile, ListBox
+from urwid import Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.interactive import Selector
 from subiquitycore.ui.utils import Color, Padding
 

subiquity/ui/views/ceph.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Text, Columns, Pile, ListBox
+from urwid import Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import StringEditor
 from subiquitycore.ui.utils import Color, Padding
 

subiquity/ui/views/filesystem/add_format.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import ListBox, Pile, Text, Columns
+from urwid import Text
 
 from subiquitycore.ui.buttons import done_btn, cancel_btn
 from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import Selector, MountEditor
 from subiquitycore.view import BaseView
 

subiquity/ui/views/filesystem/add_partition.py

@@ -21,9 +21,10 @@ configuration.
 """
 import logging
 import re
-from urwid import connect_signal, ListBox, Pile, Text, Columns, Padding as UrwidPadding, WidgetDisable
+from urwid import connect_signal, Text, Padding as UrwidPadding, WidgetDisable
 
 from subiquitycore.ui.buttons import done_btn, cancel_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.ui.interactive import (StringEditor, IntegerEditor,
                                           Selector, MountEditor)

subiquity/ui/views/filesystem/disk_info.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Pile, Text
+from urwid import Text
 
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import done_btn
+from subiquitycore.ui.container import Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquity/ui/views/filesystem/disk_partition.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import ListBox, Pile, BoxAdapter, Text, Columns
+from urwid import BoxAdapter, Text
 
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import done_btn, cancel_btn, menu_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquity/ui/views/filesystem/filesystem.py

@@ -20,13 +20,14 @@ configuration.
 
 """
 import logging
-from urwid import (ListBox, Pile, BoxAdapter, Text, Columns)
+from urwid import BoxAdapter, Text
 
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import (done_btn,
                                       reset_btn,
                                       cancel_btn,
                                       menu_btn)
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquity/ui/views/identity.py

@@ -15,13 +15,14 @@
 
 import logging
 
-from urwid import Pile, Columns, Text, ListBox
+from urwid import Text
 
 from subiquitycore.ui.buttons import done_btn, cancel_btn
 from subiquitycore.ui.interactive import (PasswordEditor,
                                           RealnameEditor,
                                           StringEditor,
                                           UsernameEditor)
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquity/ui/views/installpath.py

@@ -19,11 +19,12 @@ Provides high level options for Ubuntu install
 
 """
 import logging
-from urwid import (ListBox, Pile, BoxAdapter)
+from urwid import BoxAdapter
 
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import menu_btn, cancel_btn
 from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.view import BaseView
 
 log = logging.getLogger('subiquity.installpath')

subiquity/ui/views/installprogress.py

@@ -16,14 +16,13 @@
 import logging
 from urwid import (
     LineBox,
-    ListBox,
     Text,
-    Pile,
     SimpleListWalker,
     )
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import confirm_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 
 log = logging.getLogger("subiquity.views.installprogress")

subiquity/ui/views/iscsi.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Text, Columns, Pile, ListBox
+from urwid import Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import menu_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import (StringEditor, YesNo,
                                           PasswordEditor)
 from subiquitycore.ui.utils import Color, Padding

subiquity/ui/views/lvm.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Text, Columns, Pile, ListBox, CheckBox
+from urwid import Text, CheckBox
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import UsernameEditor
 from subiquitycore.ui.utils import Color, Padding
 

subiquity/ui/views/raid.py

@@ -14,10 +14,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from urwid import Text, Columns, Pile, ListBox, CheckBox
+from urwid import Text, CheckBox
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import (StringEditor, IntegerEditor,
                                           Selector)
 from subiquitycore.ui.utils import Color, Padding

subiquity/ui/views/welcome.py

@@ -19,9 +19,10 @@ Welcome provides user with language selection
 
 """
 import logging
-from urwid import (ListBox, Pile, BoxAdapter)
+from urwid import BoxAdapter
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import menu_btn, ok_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquitycore/ui/interactive.py

@@ -24,7 +24,6 @@ from urwid import (
     Filler,
     IntEdit,
     LineBox,
-    Pile,
     PopUpLauncher,
     SelectableIcon,
     Text,
@@ -34,6 +33,8 @@ from urwid import (
 import logging
 import re
 
+from subiquitycore.ui.container import Pile
+
 log = logging.getLogger("subiquitycore.ui.input")
 
 

subiquitycore/ui/lists.py

@@ -13,7 +13,9 @@
 # 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 ListBox, SimpleListWalker, WidgetWrap
+from urwid import SimpleListWalker, WidgetWrap
+
+from subiquitycore.ui.container import ListBox
 
 
 class SimpleList(WidgetWrap):

subiquitycore/ui/views/login.py

@@ -19,8 +19,9 @@ Login provides user with language selection
 
 """
 import logging
-from urwid import (ListBox, Pile, Text)
+from urwid import Text
 from subiquitycore.ui.buttons import finish_btn
+from subiquitycore.ui.container import Pile, ListBox
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquitycore/ui/views/network.py

@@ -22,11 +22,16 @@ Provides network device listings and extended network information
 import logging
 import textwrap
 
-from urwid import (ListBox, Pile,
-                   Text, Columns, Overlay,
-                   LineBox, ProgressBar, WidgetWrap)
+from urwid import (
+    LineBox,
+    Overlay,
+    ProgressBar,
+    Text,
+    WidgetWrap,
+    )
 
 from subiquitycore.ui.buttons import cancel_btn, menu_btn, done_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Padding, Color
 from subiquitycore.view import BaseView
 

subiquitycore/ui/views/network_bond_interfaces.py

@@ -13,9 +13,10 @@
 # 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 Text, Columns, Pile, ListBox, CheckBox
+from urwid import Text, CheckBox
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import Selector
 from subiquitycore.ui.utils import Color, Padding
 import logging

subiquitycore/ui/views/network_configure_interface.py

@@ -13,9 +13,9 @@
 # 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 Pile, ListBox
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import done_btn, menu_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Color, Padding
 from subiquitycore.ui.views.network import _build_gateway_ip_info_for_version, _build_wifi_info
 import logging
@@ -40,7 +40,6 @@ class NetworkConfigureInterfaceView(BaseView):
             self.wifi_info = Pile(_build_wifi_info(self.dev))
             self.wifi_method = Pile(self._build_wifi_config())
 
-
     def _build_body(self):
         body = []
         if self.dev.type == 'wlan':

subiquitycore/ui/views/network_configure_manual_interface.py

@@ -16,10 +16,11 @@
 import logging
 import ipaddress
 
-from urwid import Text, Pile, ListBox, Columns
+from urwid import Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import done_btn, menu_btn, cancel_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.utils import Color, Padding
 from subiquitycore.ui.interactive import StringEditor
 

subiquitycore/ui/views/network_configure_wlan_interface.py

@@ -1,6 +1,7 @@
-from urwid import Text, Pile, ListBox, Columns, Overlay, WidgetWrap, LineBox, Button, BoxAdapter
+from urwid import Text, Overlay, WidgetWrap, LineBox, Button, BoxAdapter
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn, menu_btn
+from subiquitycore.ui.container import Columns, ListBox, Pile
 from subiquitycore.ui.interactive import PasswordEditor, StringEditor
 from subiquitycore.ui.utils import Color, Padding
 import logging

subiquitycore/ui/views/network_default_route.py

@@ -16,10 +16,11 @@
 import logging
 import socket
 
-from urwid import Text, Pile, ListBox
+from urwid import Text
 
 from subiquitycore.view import BaseView
 from subiquitycore.ui.buttons import cancel_btn, done_btn, menu_btn
+from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.ui.utils import Color, Padding
 from subiquitycore.ui.interactive import StringEditor