Merge tag '1.1.1' into debian/newton

Positional Release

Change-Id: I81f3402cc4a23f889dfed1cb623f6b98e97c241a
version: 1.1.1
date: 2016-06-26
Notes: bug fix to make setup.py and requirements.txt match

README.rst

@@ -22,7 +22,7 @@ parameters. For example, in Python 3 it is possible to write:
 
 .. code:: python
 
-    >>> def fn(pos1, *, kwonly1 kwonly=None):
+    >>> def fn(pos1, *, kwonly1, kwonly2=None):
     ...     ...
 
 All named parameters after `*` must be a keyword:

debian/changelog

@@ -1,9 +1,14 @@
-python-positional (1.0.1-3) UNRELEASED; urgency=medium
+python-positional (1.1.1-1) experimental; urgency=medium
 
+  [ Ondřej Nový ]
   * d/rules: Changed UPSTREAM_GIT protocol to https
   * d/copyright: Changed source URL to https protocol
 
- -- Ondřej Nový <novy@ondrej.org>  Thu, 19 May 2016 21:28:30 +0200
+  [ James Page ]
+  * New upstream release.
+  * Align (Build-)Depends with upstream.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 07 Sep 2016 09:58:51 +0100
 
 python-positional (1.0.1-2) unstable; urgency=medium
 

debian/control

@@ -18,10 +18,12 @@ Build-Depends-Indep: python-coverage,
                      python-hacking,
                      python-testresources (>= 0.2.4),
                      python-testtools (>= 1.4.0),
+                     python-wrapt,
                      python3-fixtures (>= 1.3.1),
                      python3-subunit,
                      python3-testresources (>= 0.2.4),
                      python3-testtools (>= 1.4.0),
+                     python3-wrapt,
                      subunit,
                      testrepository,
 Standards-Version: 3.9.6

positional/__init__.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import functools
 import inspect
 import warnings
 
 import pbr.version
+import wrapt
 
 __version__ = pbr.version.VersionInfo('positional').version_string()
 
@@ -76,14 +76,21 @@ class positional(object):
 
         plural = '' if self._max_positional_args == 1 else 's'
 
-        @functools.wraps(func)
-        def inner(*args, **kwargs):
-            if len(args) > self._max_positional_args:
+        @wrapt.decorator
+        def inner(wrapped, instance, args, kwargs):
+
+            # If called on an instance, adjust args len for the 'self'
+            # parameter.
+            args_len = len(args)
+            if instance:
+                args_len += 1
+
+            if args_len > self._max_positional_args:
                 message = ('%(name)s takes at most %(max)d positional '
                            'argument%(plural)s (%(given)d given)' %
-                           {'name': func.__name__,
+                           {'name': wrapped.__name__,
                             'max': self._max_positional_args,
-                            'given': len(args),
+                            'given': args_len,
                             'plural': plural})
 
                 if self._enforcement == self.EXCEPT:
@@ -91,6 +98,6 @@ class positional(object):
                 elif self._enforcement == self.WARN:
                     warnings.warn(message, DeprecationWarning, stacklevel=2)
 
-            return func(*args, **kwargs)
+            return wrapped(*args, **kwargs)
 
-        return inner
+        return inner(func)

positional/tests/test_positional.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import inspect
 import warnings
 
 import testtools
@@ -81,3 +82,15 @@ class TestPositional(testtools.TestCase):
     def test_normal_method(self):
         self.assertEqual((self, 1, 2), self.normal_method(1, b=2))
         self.assertRaises(TypeError, self.normal_method, 1, 2)
+
+    def test_argspec_preserved(self):
+
+        @positional()
+        def f_wrapped(my_arg=False):
+            return my_arg
+
+        def f_not_wrapped(my_arg=False):
+            return my_arg
+
+        self.assertEqual(inspect.getargspec(f_not_wrapped),
+                         inspect.getargspec(f_wrapped))

requirements.txt

@@ -1,4 +1,5 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance.
 
-pbr>=1.6
+pbr>=1.8
+wrapt