Permalink
Browse files

Merge branch 'master' into dev

  • Loading branch information...
joonty committed Jan 23, 2013
2 parents a0409a7 + ce3b977 commit ec488b8bcb258dce644b6d5b02d06f3950fe1be5
View
@@ -5,4 +5,4 @@ python:
# command to install dependencies
install: "pip install -r requirements.txt --use-mirrors"
# command to run tests
-script: vdebugtests
+script: python vdebugtests.py
View
@@ -1,3 +1,12 @@
+=== Vdebug 1.3.0 / 2012-12-21
+
+Bug fixes:
+ * Filepath problems with Windows version
+
+Other:
+ * Packaged tests as an easy-to-run suite
+ * Set up on Travis CI
+
=== Vdebug 1.3.0 / 2012-12-19
Features:
View
@@ -1,5 +1,7 @@
# Vdebug
+[![Build Status](https://travis-ci.org/joonty/vdebug.png?branch=master)](https://travis-ci.org/joonty/vdebug)
+
Vdebug is a new, fast, powerful debugger client for Vim. It's multi-language,
and has been tested with PHP, Python, Ruby, Perl, Tcl and NodeJS. It interfaces with
**any** debugger that faithfully uses the DBGP protocol, such as Xdebug for PHP.
View
@@ -1 +1 @@
-1.3.0
+1.3.1
View
@@ -8,7 +8,7 @@
" Description: Multi-language debugger client for Vim (PHP, Ruby, Python,
" Perl, NodeJS)
" Maintainer: Jon Cairns <jon at joncairns.com>
-" Version: 1.2
+" Version: 1.3.1
" Inspired by the Xdebug plugin, which was originally written by
" Seung Woo Shin <segv <at> sayclub.com> and extended by many
" others.
@@ -44,7 +44,7 @@ endif
" Nice characters get screwed up on windows
if has('win32') || has('win64')
let g:vdebug_force_ascii = 1
-elseif has('multibyte') == 0
+elseif has('multi_byte') == 0
let g:vdebug_force_ascii = 1
else
let g:vdebug_force_ascii = 0
View
@@ -1,2 +1,2 @@
-unittest
+unittest2
mock
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
import vdebug.breakpoint
import vdebug.util
import base64
View
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
import vdebug.dbgp
from mock import MagicMock, patch
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
import vdebug.dbgp
class SocketMockError():
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
import vdebug.dbgp
import xml.etree.ElementTree as ET
@@ -1,7 +1,7 @@
+import sys
if __name__ == "__main__":
- import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
import vdebug.dbgp
import xml
from mock import Mock
@@ -29,6 +29,8 @@ def test_as_string(self):
assert res.as_string() == response
def test_as_xml_is_element(self):
+ if sys.version_info < (2, 7):
+ return
"""Test that the as_xml() method returns an XML
element"""
response = """<?xml version="1.0" encoding="iso-8859-1"?>
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
from vdebug.opts import Options,OptionsError
class OptionsTest(unittest.TestCase):
@@ -1,7 +1,7 @@
if __name__ == "__main__":
import sys
sys.path.append('../plugin/python/')
-import unittest
+import unittest2 as unittest
""" Mock vim import """
import vdebug.opts
from vdebug.util import FilePath,FilePathError
View
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
import sys
sys.path.append('tests')

0 comments on commit ec488b8

Please sign in to comment.