Merge branch 'netrc-integration'

[offlineimap] / offlineimap / ui / __init__.py

diff --git a/offlineimap/ui/__init__.py b/offlineimap/ui/__init__.py
index d470819949f2f0885a782549c8052cc44733df5c..0206ab46176906e7b7e6ab8cff0439cdf6d34c2b 100644 (file)
--- a/offlineimap/ui/__init__.py
+++ b/offlineimap/ui/__init__.py
@@ -14,7 +14,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 
 import UIBase, Blinkenlights
@@ -23,13 +23,6 @@ try:
 except ImportError:
     pass
 
-try:
-    import Tkinter
-except ImportError:
-    pass
-else:
-    import Tk
-
 try:
     import curses
 except ImportError:
@@ -38,6 +31,7 @@ else:
     import Curses
 
 import Noninteractive
+import Machine
 
 # Must be last
 import detector