Merge pull request #42 from XanaduAI/pylinting

pylinting
PennyLaneAI · Jan 2, 2019 · 8b64b42 · 8b64b42
2 parents f850e93 + 4953b63
commit 8b64b42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pennylane_pq/devices.py b/pennylane_pq/devices.py
@@ -294,7 +294,7 @@ class ProjectQSimulator(_ProjectQDevice):
     short_name = 'projectq.simulator'
     _operation_map = PROJECTQ_OPERATION_MAP
     _expectation_map = dict({key:val for key, val in _operation_map.items()
-                        if val in [XGate, YGate, ZGate, HGate]} , **{'Identity': None})
+                             if val in [XGate, YGate, ZGate, HGate]}, **{'Identity': None})
     _circuits = {}
     _backend_kwargs = ['gate_fusion', 'rnd_seed']
 

diff --git a/pennylane_pq/pqops.py b/pennylane_pq/pqops.py
@@ -35,8 +35,8 @@ def __str__(self):
         return self.name
 
 try:
-    from projectq.ops import MatrixGate
-except:
+    from projectq.ops import MatrixGate #pylint: disable=ungrouped-imports
+except ImportError:
     MatrixGate = BasicGate
 
 class BasicProjectQMatrixGate(MatrixGate): # pylint: disable=too-few-public-methods