Permalink
Browse files

testing, more migration to github

  • Loading branch information...
1 parent e5e725d commit 80d7444a46c87f775e198ee8bef80642175a261a @gyllstromk committed May 22, 2012
Showing with 10 additions and 7 deletions.
  1. +2 −0 MANIFEST.in
  2. +1 −1 blargs.py
  3. +2 −2 doc/index.rst
  4. +2 −2 test.py
  5. +3 −2 tox.ini
View
@@ -0,0 +1,2 @@
+include README.rst
+include LICENSE
View
@@ -21,7 +21,7 @@
if sys.version_info[0] == 3:
iterkeys = lambda x: x.keys()
- iteritems = lambda x: x.items()
+ iteritems = lambda x: iter(x.items())
isstring = lambda x: isinstance(x, str)
from urllib.parse import urlparse
xrange = range
View
@@ -27,7 +27,7 @@ Blargs has been tested on Python2.6 to Python3.2 and PyPy.
Note: blargs is currently still in *beta*. You can help by submitting bugs here_!
-.. _here: https://bitbucket.org/gyllstromk/blargs/issues?status=new&status=open
+.. _here: https://github.com/gyllstromk/blargs/issues/new
Installation
============
@@ -42,7 +42,7 @@ Or by git:
::
- git clone https://bitbucket.org/gyllstromk/blargs.git
+ git clone https://github.com/gyllstromk/blargs.git
License
=======
View
@@ -253,7 +253,7 @@ def test_help(self):
p.out = StringIO()
p.print_help()
- self.assertEqual(p.out.getvalue(), 'Usage: test.py [--a <int>] [--c <float>] [--b <float>] [--help/-h]\nOptions: (! denotes required argument)\n --a <int> a fun variable Requires --b\n --c <float> \n --b <float> yet another a fun variable Conflicts with --a, --c Requires --b\n --help/-h Print help message. \n')
+ self.assertEqual(p.out.getvalue(), 'Usage: %s [--a <int>] [--c <float>] [--b <float>] [--help/-h]\nOptions: (! denotes required argument)\n --a <int> a fun variable Requires --b\n --c <float> \n --b <float> yet another a fun variable Conflicts with --a, --c Requires --b\n --help/-h Print help message. \n' % sys.argv[0])
def test_error_printing(self):
def create(strio):
@@ -277,7 +277,7 @@ def create(strio):
s = StringIO()
self.assertRaises(FakeSystemExit, create, s)
- self.assertEqual(s.getvalue(), '''Error: [--a, --b, --c, --d] not specified\nUsage: test.py [--a <int>] [--yi/-y <option>] [--c <float>] [--b <int>] [--e <range>] [--help/-h] [--x <int>] [--z <float>] [--d <range>]\n'''.format(sys.argv[0]))
+ self.assertEqual(s.getvalue(), '''Error: [--a, --b, --c, --d] not specified\nUsage: {0} [--a <int>] [--yi/-y <option>] [--c <float>] [--b <int>] [--e <range>] [--help/-h] [--x <int>] [--z <float>] [--d <range>]\n'''.format(sys.argv[0]))
def test_url(self):
p = Parser()
View
@@ -2,5 +2,6 @@
envlist = py26,py27,py31,py32,pypy
[testenv]
-deps=nose
-commands=nosetests
+;deps=nose
+;commands=nosetests
+commands=python setup.py test

0 comments on commit 80d7444

Please sign in to comment.