Merge pull request zodb#1 from NetAccessCorp/master

fix stuff

CHANGES.txt

@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+2.3 (2015-10-22)
+
+- Add MANIFEST file
+
+2.2 (2015-10-22)
+----------------
+
+- Update CHANGES
+
+2.1 (2015-10-22)
+----------------
+
+- Detect if decorated method is class method or object method and behave
+  accordingly.
+
 2.0 (2013-12-10)
 ----------------
 

MANIFEST.in

@@ -0,0 +1,3 @@
+include *.txt
+include *.cfg
+include *.py

perfmetrics/__init__.py

@@ -11,6 +11,7 @@
 import functools
 import os
 import random
+import six
 
 
 try:  # pragma no cover
@@ -135,7 +136,10 @@ def call_with_metric(*args, **kw):
             if instance_stat:
                 stat = instance_stat
             elif method:
-                cls = args[0].__class__
+                if isinstance(args[0], (type, six.class_types)):
+                    cls = args[0]
+                else:
+                    cls = args[0].__class__
                 stat = '%s.%s.%s' % (cls.__module__, cls.__name__, func_name)
             else:
                 stat = func_full_name

setup.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-requires = ['setuptools']
+requires = ['setuptools', 'six']
 
 if sys.version_info[:2] < (2, 7):
     requires.append('unittest2')
@@ -12,8 +12,8 @@
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
-setup(name='perfmetrics',
-      version='2.0',
+setup(name='netaccess_perfmetrics',
+      version='2.3',
       author='Shane Hathaway',
       author_email='shane@hathawaymix.org',
       description='Send performance metrics about Python code to Statsd',
@@ -26,7 +26,7 @@
                    "License :: Repoze Public License",
                    "Topic :: System :: Monitoring",
                    ],
-      url="https://github.com/hathawsh/perfmetrics",
+      url="https://github.com/NetAccessCorp/perfmetrics",
       license='BSD-derived (http://www.repoze.org/LICENSE.txt)',
       packages=find_packages(),
       include_package_data=True,