Revert "Fix instruction inheritance issues (#1900)" (#1906)

This reverts commit 36d5d5d.

CHANGELOG.rst

@@ -20,17 +20,6 @@ The format is based on `Keep a Changelog`_.
 `UNRELEASED`_
 =============
 
-
-`0.7.2`_ - 2019-03-05
-=====================
-
-
-Fixed
------
-
-- Fixed a bug whereby inheriting from QuantumRegister or ClassicalRegister
-  would cause a QiskitError in instruction.py
-
 `0.7.1`_ - 2019-03-04
 =====================
 

qiskit/circuit/instruction.py

@@ -47,9 +47,9 @@ def __init__(self, name, param, qargs, cargs, circuit=None):
         Raises:
             QiskitError: when the register is not in the correct format.
         """
-        if not all(isinstance(i[0], QuantumRegister) and isinstance(i[1], int) for i in qargs):
+        if not all((type(i[0]), type(i[1])) == (QuantumRegister, int) for i in qargs):
             raise QiskitError("qarg not (QuantumRegister, int) tuple")
-        if not all(isinstance(i[0], ClassicalRegister) and isinstance(i[1], int) for i in cargs):
+        if not all((type(i[0]), type(i[1])) == (ClassicalRegister, int) for i in cargs):
             raise QiskitError("carg not (ClassicalRegister, int) tuple")
         self.name = name
         self.param = []  # a list of gate params stored as sympy objects