clearer check of wp_json_v1

derwentx · derwentx · commit b3940af31a12 · 2018-10-25T18:10:35.000+11:00
diff --git a/wordpress/transport.py b/wordpress/transport.py
@@ -40,13 +40,17 @@ def api_url(self):
         ]
         return UrlUtils.join_components(components)
 
+    @property
+    def is_wp_json_v1(self):
+        return self.api == 'wp-json' and self.api_version == 'wp/v1'
+
     @property
     def api_ver_url(self):
         components = [
             self.url,
             self.api,
         ]
-        if self.api_version != 'wp/v1':
+        if not self.is_wp_json_v1:
             components += [
                 self.api_version
             ]
@@ -64,7 +68,7 @@ def endpoint_url(self, endpoint):
             self.url,
             self.api
         ]
-        if self.api_version != 'wp/v1':
+        if not self.is_wp_json_v1:
             components += [
                 self.api_version
             ]

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,17 @@ def api_url(self):`
`40`	`40`	`]`
`41`	`41`	`return UrlUtils.join_components(components)`
`42`	`42`
	`43`	`+ @property`
	`44`	`+ def is_wp_json_v1(self):`
	`45`	`+ return self.api == 'wp-json' and self.api_version == 'wp/v1'`
	`46`	`+`
`43`	`47`	`@property`
`44`	`48`	`def api_ver_url(self):`
`45`	`49`	`components = [`
`46`	`50`	`self.url,`
`47`	`51`	`self.api,`
`48`	`52`	`]`
`49`		`- if self.api_version != 'wp/v1':`
	`53`	`+ if not self.is_wp_json_v1:`
`50`	`54`	`components += [`
`51`	`55`	`self.api_version`
`52`	`56`	`]`
`@@ -64,7 +68,7 @@ def endpoint_url(self, endpoint):`
`64`	`68`	`self.url,`
`65`	`69`	`self.api`
`66`	`70`	`]`
`67`		`- if self.api_version != 'wp/v1':`
	`71`	`+ if not self.is_wp_json_v1:`
`68`	`72`	`components += [`
`69`	`73`	`self.api_version`
`70`	`74`	`]`