Permalink
Browse files

Merged from gotcha/ipdb:master to see if auto-merge works.

  • Loading branch information...
2 parents 490d9f4 + dc72c95 commit 1bef20829410165703a88a35d51cf42a68695d03 @dimasad dimasad committed Mar 18, 2012
Showing with 8 additions and 4 deletions.
  1. +2 −1 HISTORY.txt
  2. +1 −1 manual_test.py
  3. +5 −2 setup.py
View
@@ -4,7 +4,8 @@ Changelog
0.7 (unreleased)
----------------
-- Nothing changed yet.
+- Python 3 support.
+ [Piet Delport]
- Added the functions ``runcall``, ``runeval`` and ``run``.
[dimasad]
View
@@ -1,5 +1,5 @@
def output(arg):
- print "MANUAL: arg=", arg
+ print("MANUAL: arg=%s" % arg)
def main():
View
@@ -2,8 +2,8 @@
version = '0.7dev'
-long_description = (file('README.rst').read() +
- '\n\n' + file('HISTORY.txt').read())
+long_description = (open('README.rst').read() +
+ '\n\n' + open('HISTORY.txt').read())
setup(name='ipdb',
@@ -15,6 +15,8 @@
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.2',
'Operating System :: MacOS :: MacOS X',
'Operating System :: POSIX :: Linux',
'Operating System :: Microsoft :: Windows',
@@ -34,4 +36,5 @@
entry_points={
'console_scripts': ['ipdb = ipdb.__main__:main']
},
+ use_2to3=True,
)

0 comments on commit 1bef208

Please sign in to comment.