changeset f296b9b9bc56 in joypy/Joypy details: http://hg.osdn.jp/view/joypy/Joypy?cmd=changeset;node=f296b9b9bc56 user: Simon Forman <sform****@hushm*****> date: Tue May 19 15:44:44 2020 -0700 description: Rename imports as neccesary. diffstat: xerblin/gui/__main__.py | 4 ++-- xerblin/gui/controllerlistbox.py | 5 +---- xerblin/gui/main.py | 8 ++++---- xerblin/gui/world.py | 5 ++++- 4 files changed, 11 insertions(+), 11 deletions(-) diffs (75 lines): diff -r 239cf1409d4f -r f296b9b9bc56 xerblin/gui/__main__.py --- a/xerblin/gui/__main__.py Tue May 19 15:34:20 2020 -0700 +++ b/xerblin/gui/__main__.py Tue May 19 15:44:44 2020 -0700 @@ -18,7 +18,7 @@ # along with Joypy. If not see <http://www.gnu.org/licenses/>. # import sys -import joy.gui.main +import xerblin.gui.main -sys.exit(joy.gui.main.main()) +sys.exit(xerblin.gui.main.main()) diff -r 239cf1409d4f -r f296b9b9bc56 xerblin/gui/controllerlistbox.py --- a/xerblin/gui/controllerlistbox.py Tue May 19 15:34:20 2020 -0700 +++ b/xerblin/gui/controllerlistbox.py Tue May 19 15:44:44 2020 -0700 @@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ''' -from future import standard_library -standard_library.install_aliases() -from builtins import map, object, str from tkinter import Listbox, SINGLE from tkinter.dnd import dnd_start from joy.utils.stack import iter_stack, list_to_stack, expression_to_string @@ -153,4 +150,4 @@ def format(item): if isinstance(item, tuple): return '[%s]' % expression_to_string(item) - return str(item) + return (item) diff -r 239cf1409d4f -r f296b9b9bc56 xerblin/gui/main.py --- a/xerblin/gui/main.py Tue May 19 15:34:20 2020 -0700 +++ b/xerblin/gui/main.py Tue May 19 15:44:44 2020 -0700 @@ -24,7 +24,7 @@ from textwrap import dedent from configparser import RawConfigParser -from joy.gui.utils import init_home, argparser, FileFaker +from xerblin.gui.utils import init_home, argparser, FileFaker DATETIME_FORMAT = "Thun • %B %d %a • %I:%M %p" @@ -48,9 +48,9 @@ # Now that logging is set up, continue loading the system. -from joy.gui.textwidget import TextViewerWidget, tk, get_font -from joy.gui.world import StackWorld -from joy.gui.controllerlistbox import StackListbox +from xerblin.gui.textwidget import TextViewerWidget, tk, get_font +from xerblin.gui.world import StackWorld +from xerblin.gui.controllerlistbox import StackListbox from joy.library import initialize, DefinitionWrapper from joy.utils.stack import stack_to_string diff -r 239cf1409d4f -r f296b9b9bc56 xerblin/gui/world.py --- a/xerblin/gui/world.py Tue May 19 15:34:20 2020 -0700 +++ b/xerblin/gui/world.py Tue May 19 15:44:44 2020 -0700 @@ -30,10 +30,13 @@ from joy.library import HELP_TEMPLATE from joy.parser import Symbol from joy.utils.stack import stack_to_string -from joy.utils.types import type_check from .utils import is_numerical +def type_check(name, stack): + return # None indicating "I dunno." + + class World(object): def __init__(self, stack=(), dictionary=None, text_widget=None):
Fork