Skip to content

Commit

Permalink
Merge branch 'hotfix/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mdbetancourt committed Dec 8, 2017
2 parents a18a821 + 5f74d35 commit 369ff76
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,4 @@ language: python
python:
- 3.6
- 3.5
- 3.4
- 3.3
script: tox
6 changes: 3 additions & 3 deletions tebless/devs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import functools

__all__ = ['Widget', 'init_debug', 'Debug', 'echo']

from ._debug import init_debug, Debug
from ._widget import Widget

echo = functools.partial(print, end='', flush=True)

__all__ = ['Widget', 'init_debug', 'Debug']
from ._debug import init_debug, Debug
from ._widget import Widget
2 changes: 1 addition & 1 deletion tebless/examples/nested_windows.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from tebless.devs import init_debug
from tebless.utils import Store
from tebless.widgets import Window, Input, Label
from tebless.widgets import Window, Input, Label

_store = Store()

Expand Down
6 changes: 4 additions & 2 deletions tebless/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ def fromkeys(cls, seq, value=None):
d._map = OrderedDict.fromkeys(seq, value)
return d

def __getstate__(self): return self.__dict__
def __getstate__(self):
return self.__dict__

def __setstate__(self, d): self.__dict__.update(d)
def __setstate__(self, d):
self.__dict__.update(d)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ python =
[testenv:flake8]
basepython=python
deps=flake8
commands=flake8 tebless
commands=flake8 tebless --ignore=E402

[testenv]
setenv =
Expand Down

0 comments on commit 369ff76

Please sign in to comment.