From 0540f4ab25d68394ce3a237c511185959102b4b3 Mon Sep 17 00:00:00 2001
From: Jorn van Wier <jorn.van.wier@thunderbyte.ai>
Date: Thu, 26 Mar 2020 13:33:46 +0100
Subject: [PATCH] fix URLPathVersioning reverse fallback

---
 rest_framework/versioning.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index 8c35a1a58..e25d36f4a 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -81,8 +81,10 @@ class URLPathVersioning(BaseVersioning):
 
     def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
         if request.version is not None:
-            kwargs = {} if (kwargs is None) else kwargs
-            kwargs[self.version_param] = request.version
+            kwargs = {
+                self.version_param: request.version,
+                **(kwargs or {})
+            }
 
         return super().reverse(
             viewname, args, kwargs, request, format, **extra