bumped version + small enhancements

README.rst

@@ -393,11 +393,11 @@ A callback registration can be removed by calling ``reporter.remove`` with the i
 ``reporter`` provides a simple scheduler object, ``fixed_interval_scheduler``::
 
     >>> sched = reporter.fixed_interval_scheduler(10)
-    >>> sched.next()
+    >>> next(sched)
     1397297405.672592
-    >>> sched.next()
+    >>> next(sched)
     1397297415.672592
-    >>> sched.next()
+    >>> next(sched)
     1397297425.672592
 
 CSV reporter
@@ -413,7 +413,7 @@ Testing
 ``AppMetrics`` has an exhaustive, fully covering test suite, made up by both doctests and unit tests. To run the
 whole test suite (including the coverage test), just issue::
 
-    $ nosetests --with-doctest --with-coverage --cover-package=appmetrics --cover-erase
+    $ nosetests --with-coverage --cover-package=appmetrics --cover-erase
 
 You will need to install a couple of packages in your python environment, the list is in the
 ``"requirements.txt"`` file.

appmetrics/py3comp.py

@@ -21,8 +21,6 @@
 import sys
 import json
 
-from nose import tools as nt
-
 PY3 = sys.version_info[0] == 3
 
 if PY3:
@@ -42,12 +40,16 @@ def iteritems(d, **kw):
 
     zip = zip
 
+
 def assert_items_equal(*args):
+    from nose import tools as nt
+
     if hasattr(nt, 'assert_items_equal'):
         return nt.assert_items_equal(*args)
     else:
         return nt.assert_equal(set(args[0]), set(args[1]))
 
+
 def json_load(stream, charset):
     # thanks very much, python 3...
     if PY3:

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name = "AppMetrics",
-    version = "0.2",
+    version = "0.3",
 
     packages = find_packages(),
 
@@ -29,5 +29,7 @@
         "License :: OSI Approved :: Apache Software License",
         "Topic :: Software Development :: Quality Assurance",
         "Topic :: System :: Monitoring",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.3",
     ]
 )