py3k support

.gitignore

@@ -1,2 +1,53 @@
-.tox
-coverage
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/

.travis.yml

@@ -1,11 +1,9 @@
 language: python
 python:
-  - 2.5
-  - 2.6
   - 2.7
+  - 3.4
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
   - pip install . --use-mirrors
 # command to run tests, e.g. python setup.py test
-script: py.test .
-
+script: python setup.py test

README.rst

@@ -2,6 +2,25 @@
 VIM Pdb integration
 ===================
 
+Latest
+
+
+Use ``pip3 install git+https://github.com/byronyi/vimpdb`` to install the
+package.
+
+Use ``python setup.py test`` to test the package if you would like to
+participate in the development. (Requires package ``pytest``)
+
+This package is awesome but not active since 2011. Let's port it into py3k!
+
+Remember: put the following config into your ``~/.vimpdbrc``!
+::
+    [vimpdb]                                                                        
+    vim_client_script = mvim
+    vim_server_script = mvim
+    server_name = VIM 
+    port = 6666
+
 Abstract
 ========
 

manual_test.py

@@ -1,5 +1,8 @@
+from __future__ import print_function
+
+
 def output(arg):
-    print "MANUAL: arg=", arg
+    print("MANUAL: arg={}".format(arg))
 
 
 def main():

setup.py

@@ -1,4 +1,26 @@
 from setuptools import setup, find_packages
+import sys
+from setuptools.command.test import test as TestCommand
+
+
+class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = ['.']
+
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        #import here, cause outside the eggs aren't loaded
+        import pytest
+        errno = pytest.main(self.pytest_args)
+        sys.exit(errno)
+
 
 version = '0.4.6dev'
 
@@ -25,13 +47,21 @@
       author_email='gotcha@bubblenet.be',
       url='http://github.com/gotcha/vimpdb',
       license='MIT',
-      packages=find_packages('src'),
-      package_dir={'': 'src'},
       include_package_data=True,
+      packages=find_packages(),
       zip_safe=False,
       install_requires=[
           'vim_bridge',
+          'six'
+      ],
+      tests_require=[
+          'mock',
+          'pytest'
       ],
+      package_data = {
+          'vimpdb': ['vimpdb.vim']
+      },
+      cmdclass = {'test': PyTest},
       entry_points="""
       # -*- Entry points: -*-
       """,

src/vimpdb/tests/scripts/communicator.py → tests/scripts/communicator.py

@@ -1,5 +1,9 @@
+from __future__ import print_function
+
 import optparse
 import sys
+
+
 parser = optparse.OptionParser()
 parser.add_option('--servername', dest="server_name")
 parser.add_option('--remote-expr', dest="expr")
@@ -9,6 +13,6 @@
 parser.parse_args(sys.argv)
 
 if hasattr(parser.values, 'expr'):
-    print parser.values.expr, parser.values.server_name
+    print(parser.values.expr, parser.values.server_name)
 if hasattr(parser.values, 'command'):
-    print parser.values.command, parser.values.server_name
+    print(parser.values.command, parser.values.server_name)

tests/scripts/compatiblevim.py

@@ -0,0 +1,4 @@
+from __future__ import print_function
+
+
+print("+clientserver +python")

tests/scripts/nopython.py

@@ -0,0 +1,4 @@
+from __future__ import print_function
+
+
+print("+clientserver -python")

tests/scripts/noserver.py

@@ -0,0 +1,4 @@
+from __future__ import print_function
+
+
+print("-clientserver +python")

tests/scripts/rightserverlist.py

@@ -0,0 +1,4 @@
+from __future__ import print_function
+
+
+print("VIM")

tests/scripts/wrongserverlist.py

@@ -0,0 +1,4 @@
+from __future__ import print_function
+
+
+print("WRONG")

src/vimpdb/tests/test_debugger.py → tests/test_debugger.py

@@ -49,7 +49,12 @@ def test_hook(mocked_trace_dispatch):
     from vimpdb.debugger import hook
     from vimpdb.debugger import SwitcherToVimpdb
 
-    class Klass:
+    # A work around for Python bug:
+    # http://bugs.python.org/issue672115
+    class Base(object):
+        pass
+
+    class Klass(Base):
 
         def trace_dispatch(self):
             pass
@@ -74,7 +79,6 @@ class Klass:
         def do_vim(self):
             pass
 
-
     hook(Klass)
 
     assert not mocked_setupMethod.called

src/vimpdb/bbbconfig.py → vimpdb/bbbconfig.py

@@ -1,17 +1,17 @@
 import os
-import ConfigParser
+from six.moves import configparser
 
 from vimpdb import errors
 
 
 def read_from_file_4_0(filename, klass):
-    parser = ConfigParser.RawConfigParser()
+    parser = configparser.RawConfigParser()
     parser.read(filename)
     if not parser.has_section('vimpdb'):
         raise errors.BadRCFile('[vimpdb] section is missing in "%s"' %
-            filename)
+                               filename)
     error_msg = ("'%s' option is missing from section [vimpdb] in "
-        + "'" + filename + "'.")
+                 + "'" + filename + "'.")
     if parser.has_option('vimpdb', 'script'):
         vim_client_script = parser.get('vimpdb', 'script')
     else: