Changes ternary conditionals to be PEP308 compliant (#5827)

kentwait · tomchristie · commit d82b332a0908 · 2018-02-14T14:06:09.000Z
diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md
@@ -33,8 +33,8 @@ And now we can add a `.save()` method to our model class:
         representation of the code snippet.
         """
         lexer = get_lexer_by_name(self.language)
-        linenos = self.linenos and 'table' or False
-        options = self.title and {'title': self.title} or {}
+        linenos = 'table' if self.linenos else False
+        options = {'title': self.title} if self.title else {}
         formatter = HtmlFormatter(style=self.style, linenos=linenos,
                                   full=True, **options)
         self.highlighted = highlight(self.code, lexer, formatter)
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
@@ -148,7 +148,7 @@ class SimpleRouter(BaseRouter):
     ]
 
     def __init__(self, trailing_slash=True):
-        self.trailing_slash = trailing_slash and '/' or ''
+        self.trailing_slash = '/' if trailing_slash else ''
         super(SimpleRouter, self).__init__()
 
     def get_default_base_name(self, viewset):

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class SimpleRouter(BaseRouter):`
`148`	`148`	`]`
`149`	`149`
`150`	`150`	`def __init__(self, trailing_slash=True):`
`151`		`- self.trailing_slash = trailing_slash and '/' or ''`
	`151`	`+ self.trailing_slash = '/' if trailing_slash else ''`
`152`	`152`	`super(SimpleRouter, self).__init__()`
`153`	`153`
`154`	`154`	`def get_default_base_name(self, viewset):`