8 files changed, 10 insertions(+), 13 deletions(-)

M docs/tutorial.rst
M headlessvim/__init__.py
M headlessvim/_version.py
M headlessvim/runtimepath.py
M setup.cfg
M setup.py
M tests/test_headlessvim.py
M tests/test_process.py

@@ 121,7 121,7 @@ More example for `pytest <http://pytest.org>`_:
         return dict(os.environ, LANG='C')
 
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def vim(request, env):
         with headlessvim.open(args='-N -u /etc/vim/vimrc', env=env) as vim:
             vim.install_plugin('fixtures/spam', 'plugin/spam.vim')

@@ 93,7 93,7 @@ class Vim(object):
     def __setattr__(self, name, value):
         if name == 'mode':
             self.set_mode(value)
-        super(Vim, self).__setattr__(name, value)
+        super().__setattr__(name, value)
 
     def close(self):
         """


@@ 335,7 335,8 @@ class Vim(object):
         :return: (lines, columns) tuple of a screen connected to *Vim*.
         :rtype: (int, int)
         """
-        return self._swap(self._screen.size)
+        size = (self._screen.lines, self._screen.columns)
+        return self._swap(size)
 
     @screen_size.setter
     def screen_size(self, size):

@@ 6,4 6,4 @@ __all__ = ['__author__', '__email__', '__version__']
 
 __author__ = 'Ryosuke Ito'
 __email__ = 'rito.0305@gmail.com'
-__version__ = '0.0.5'
+__version__ = '0.0.6'

@@ 9,7 9,7 @@ import collections
 import weakref
 
 
-class RuntimePath(collections.MutableSequence):
+class RuntimePath(collections.abc.MutableSequence):
     def __init__(self, vim):
         """
         :param vim: ``Vim`` object which owns this object.

@@ 1,4 1,4 @@
-[pytest]
+[tool:pytest]
 norecursedirs =
     .git
     build

@@ 38,11 38,7 @@ setup(
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Topic :: Software Development :: Testing',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.11',
         'License :: OSI Approved :: MIT License',
     ],
     author=__author__,

@@ 19,7 19,7 @@ def unterminated_vim(request, env):
     return open(env=env)
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def vim(request, unterminated_vim):
     vim = unterminated_vim
     yield vim

@@ 23,7 23,7 @@ def unterminated_process(request, default_args, env):
     return Process('vim', default_args, env)
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def process(request, unterminated_process):
     process = unterminated_process
     yield process