Minor linting fixes (pyro-ppl#522)

* distributions: removed redundant conditional

* tests: fixed lint warnings

* tests: fixed lint warnings

Author: jdowner

pyro/distributions/bernoulli.py

@@ -50,16 +50,16 @@ def batch_shape(self, x=None):
         event_dim = 1
         ps = self.ps
         if x is not None:
-            if x is not None:
-                if x.size()[-event_dim] != ps.size()[-event_dim]:
-                    raise ValueError("The event size for the data and distribution parameters must match.\n"
-                                     "Expected x.size()[-1] == self.ps.size()[-1], but got {} vs {}".format(
-                                         x.size(-1), ps.size(-1)))
-                try:
-                    ps = self.ps.expand_as(x)
-                except RuntimeError as e:
-                    raise ValueError("Parameter `ps` with shape {} is not broadcastable to "
-                                     "the data shape {}. \nError: {}".format(ps.size(), x.size(), str(e)))
+            if x.size()[-event_dim] != ps.size()[-event_dim]:
+                raise ValueError("The event size for the data and distribution parameters must match.\n"
+                                 "Expected x.size()[-1] == self.ps.size()[-1], but got {} vs {}".format(
+                                     x.size(-1), ps.size(-1)))
+            try:
+                ps = self.ps.expand_as(x)
+            except RuntimeError as e:
+                raise ValueError("Parameter `ps` with shape {} is not broadcastable to "
+                                 "the data shape {}. \nError: {}".format(ps.size(), x.size(), str(e)))
+
         return ps.size()[:-event_dim]
 
     def event_shape(self):

pyro/poutine/replay_poutine.py

@@ -22,8 +22,8 @@ def __init__(self, fn, guide_trace, sites=None):
         # case 1: no sites
         if sites is None:
             self.sites = {site: site for site in guide_trace.nodes.keys()
-                          if guide_trace.nodes[site]["type"] == "sample"
-                          and not guide_trace.nodes[site]["is_observed"]}
+                          if guide_trace.nodes[site]["type"] == "sample" and
+                          not guide_trace.nodes[site]["is_observed"]}
         # case 2: sites is a list/tuple/set
         elif isinstance(sites, (list, tuple, set)):
             self.sites = {site: site for site in sites}

tests/infer/test_sampling.py

@@ -80,8 +80,8 @@ def test_complete(self):
         for tr, _ in posterior._traces():
             tr_latents.add(tuple([tr.nodes[name]["value"].view(-1).data[0]
                                   for name in tr.nodes.keys()
-                                  if tr.nodes[name]["type"] == "sample"
-                                  and not tr.nodes[name]["is_observed"]]))
+                                  if tr.nodes[name]["type"] == "sample" and
+                                  not tr.nodes[name]["is_observed"]]))
 
         assert true_latents == tr_latents
 

tests/poutine/test_poutines.py

@@ -238,8 +238,8 @@ def test_queue_enumerate(self):
         tr_latents = []
         for tr in trs:
             tr_latents.append(tuple([int(tr.nodes[name]["value"].view(-1).data[0]) for name in tr
-                                     if tr.nodes[name]["type"] == "sample"
-                                     and not tr.nodes[name]["is_observed"]]))
+                                     if tr.nodes[name]["type"] == "sample" and
+                                     not tr.nodes[name]["is_observed"]]))
 
         assert true_latents == set(tr_latents)
 
@@ -333,8 +333,8 @@ def test_prior_dict(self):
             if name in {'sigma1', 'mu1', 'sigma2', 'mu2'}:
                 self.assertTrue(name + "_prior" == lifted_tr.nodes[name]['fn'].__name__)
             if tr.nodes[name]["type"] == "param":
-                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample"
-                                and not lifted_tr.nodes[name]["is_observed"])
+                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample" and
+                                not lifted_tr.nodes[name]["is_observed"])
 
     def test_unlifted_param(self):
         tr = poutine.trace(self.guide).get_trace()
@@ -343,8 +343,8 @@ def test_unlifted_param(self):
             self.assertTrue(name in lifted_tr)
             if name in ('sigma1', 'mu1'):
                 self.assertTrue(name + "_prior" == lifted_tr.nodes[name]['fn'].__name__)
-                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample"
-                                and not lifted_tr.nodes[name]["is_observed"])
+                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample" and
+                                not lifted_tr.nodes[name]["is_observed"])
             if name in ('sigma2', 'mu2'):
                 self.assertTrue(lifted_tr.nodes[name]["type"] == "param")
 
@@ -353,8 +353,8 @@ def test_random_module(self):
         lifted_tr = poutine.trace(pyro.random_module("name", self.model, prior=self.prior)).get_trace()
         for name in lifted_tr.nodes.keys():
             if lifted_tr.nodes[name]["type"] == "param":
-                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample"
-                                and not lifted_tr.nodes[name]["is_observed"])
+                self.assertTrue(lifted_tr.nodes[name]["type"] == "sample" and
+                                not lifted_tr.nodes[name]["is_observed"])
 
     def test_random_module_prior_dict(self):
         pyro.clear_param_store()
@@ -366,8 +366,8 @@ def test_random_module_prior_dict(self):
                 dist_name = name[3:]
                 self.assertTrue(
                     dist_name + "_prior" == lifted_tr.nodes[key_name]['fn'].__name__)
-                self.assertTrue(lifted_tr.nodes[key_name]["type"] == "sample"
-                                and not lifted_tr.nodes[key_name]["is_observed"])
+                self.assertTrue(lifted_tr.nodes[key_name]["type"] == "sample" and
+                                not lifted_tr.nodes[key_name]["is_observed"])
 
 
 class QueuePoutineMixedTest(TestCase):