Replace Struct with a dataclass

sebastinas · sebastinas · commit dec96ef8ba0b · 2021-05-21T21:30:16.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -40,23 +40,23 @@
 # - View source doesn't work on windows unless you install the less program (From GnuUtils or Cygwin)
 
 
-import platform
-import os
-import sys
 import curses
+import errno
+import functools
 import math
+import os
+import platform
 import re
-import time
-import functools
-
 import struct
+import sys
+import time
+import unicodedata
+from dataclasses import dataclass
 
 if platform.system() != "Windows":
     import signal  # Windows does not have job control
     import termios  # Windows uses curses
     import fcntl  # Windows uses curses
-import unicodedata
-import errno
 
 
 # These are used for syntax highlighting
@@ -67,7 +67,7 @@
 from .formatter import BPythonFormatter
 
 # This for config
-from .config import Struct, getpreferredencoding
+from .config import getpreferredencoding
 
 # This for keys
 from .keys import cli_key_dispatch as key_dispatch
@@ -90,6 +90,13 @@
 # ---
 
 
+@dataclass
+class ShowListState:
+    cols: int = 0
+    rows: int = 0
+    wl: int = 0
+
+
 def calculate_screen_lines(tokens, width, cursor=0):
     """Given a stream of tokens and a screen width plus an optional
     initial cursor position, return the amount of needed lines on the
@@ -1254,11 +1261,7 @@ def write(self, s):
     def show_list(
         self, items, arg_pos, topline=None, formatter=None, current_item=None
     ):
-
-        shared = Struct()
-        shared.cols = 0
-        shared.rows = 0
-        shared.wl = 0
+        shared = ShowListState()
         y, x = self.scr.getyx()
         h, w = self.scr.getmaxyx()
         down = y < h // 2
diff --git a/bpython/config.py b/bpython/config.py
@@ -42,11 +42,6 @@ def __init__(self, key: str, color: str) -> None:
         self.color = color
 
 
-class Struct:
-    """Simple class for instantiating objects we can add arbitrary attributes
-    to and use for various arbitrary things."""
-
-
 def getpreferredencoding() -> str:
     """Get the user's preferred encoding."""
     return locale.getpreferredencoding() or sys.getdefaultencoding()
diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,7 @@ Pygments
 backports.cached-property; python_version < "3.8"
 curtsies >=0.3.5
 cwcwidth
+dataclasses; python_version < "3.7"
 greenlet
 pyxdg
 requests
diff --git a/setup.cfg b/setup.cfg
@@ -22,6 +22,7 @@ packages =
 install_requires =
     backports.cached-property; python_version < "3.8"
     curtsies >=0.3.5
+    dataclasses; python_version < "3.7"
     cwcwidth
     greenlet
     pygments
