summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Ward <ian@excess.org>2014-04-28 11:58:34 -0400
committerIan Ward <ian@excess.org>2014-04-28 11:58:34 -0400
commitb876aa9c00861b0a15ba86bc1c10e1071d0f8ec9 (patch)
tree6b31a32ce42ed92b3aa8ed02c56f47c206fc87fe
parent0928730d3c637a79b36d0399eb6c9accea94427d (diff)
parentdc687dc1045127c56069497da6d0b6da8b890825 (diff)
downloadurwid-b876aa9c00861b0a15ba86bc1c10e1071d0f8ec9.tar.gz
Merge branch 'urwid-windows'urwid-windows
-rwxr-xr-xurwid/display_common.py6
-rwxr-xr-xurwid/main_loop.py6
-rw-r--r--urwid/raw_display.py10
-rw-r--r--urwid/vterm.py10
4 files changed, 24 insertions, 8 deletions
diff --git a/urwid/display_common.py b/urwid/display_common.py
index 52b1704..cbe433f 100755
--- a/urwid/display_common.py
+++ b/urwid/display_common.py
@@ -20,7 +20,11 @@
import os
import sys
-import termios
+
+try:
+ import termios
+except ImportError:
+ pass # windows
from urwid.util import int_scale
from urwid import signals
diff --git a/urwid/main_loop.py b/urwid/main_loop.py
index 4677ab2..cfc8f20 100755
--- a/urwid/main_loop.py
+++ b/urwid/main_loop.py
@@ -25,11 +25,15 @@
import time
import heapq
import select
-import fcntl
import os
from functools import wraps
from weakref import WeakKeyDictionary
+try:
+ import fcntl
+except ImportError:
+ pass # windows
+
from urwid.util import is_mouse_event
from urwid.compat import PYTHON3
from urwid.command_map import command_map, REDRAW_SCREEN
diff --git a/urwid/raw_display.py b/urwid/raw_display.py
index 6a66cdd..58b3112 100644
--- a/urwid/raw_display.py
+++ b/urwid/raw_display.py
@@ -23,15 +23,19 @@
Direct terminal UI implementation
"""
-import fcntl
-import termios
import os
import select
import struct
import sys
-import tty
import signal
+try:
+ import fcntl
+ import termios
+ import tty
+except ImportError:
+ pass # windows
+
from urwid import util
from urwid import escape
from urwid.display_common import BaseScreen, RealTerminal, \
diff --git a/urwid/vterm.py b/urwid/vterm.py
index 80aab66..212094c 100644
--- a/urwid/vterm.py
+++ b/urwid/vterm.py
@@ -22,18 +22,22 @@
import os
import sys
-import pty
import time
import copy
-import fcntl
import errno
import select
import struct
import signal
import atexit
-import termios
import traceback
+try:
+ import pty
+ import fcntl
+ import termios
+except ImportError:
+ pass # windows
+
from urwid import util
from urwid.escape import DEC_SPECIAL_CHARS, ALT_DEC_SPECIAL_CHARS
from urwid.canvas import Canvas