Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions qiskit/qasm/qasm.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
"""
OPENQASM circuit object.
"""
import warnings

from .exceptions import QasmError
from .qasmparser import QasmParser

Expand All @@ -38,17 +36,6 @@ def return_filename(self):
"""Return the filename."""
return self._filename

def get_tokens(self):
"""Deprecated. Use generate_tokens()."""
warnings.warn('The method get_tokens() is being replaced by generate_tokens()',
DeprecationWarning, 2)
if self._filename:
with open(self._filename) as ifile:
self._data = ifile.read()

with QasmParser(self._filename) as qasm_p:
return qasm_p.read_tokens()

def generate_tokens(self):
"""Returns a generator of the tokens."""
if self._filename:
Expand Down
16 changes: 0 additions & 16 deletions qiskit/qasm/qasmparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import os
import shutil
import tempfile
import warnings

import numpy as np
import ply.yacc as yacc
Expand Down Expand Up @@ -1046,21 +1045,6 @@ def find_column(self, input_, token):
column = (token.lexpos - last_cr) + 1
return column

def get_tokens(self):
"""Deprecated. Use read_tokens()."""
warnings.warn('The method get_tokens() is being replaced by read_tokens()',
DeprecationWarning, 2)
try:
while True:
token = self.lexer.token()

if not token:
break

yield token
except QasmError as e:
print('Exception tokenizing qasm file:', e.msg)

def read_tokens(self):
"""finds and reads the tokens."""
try:
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/qasm_remove_0.9-7150d53da8eebfd8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
upgrade:
- |
In 0.9, ``Qasm.get_tokens`` and ``QasmParser.get_tokens`` were deprecated.
These methods are being removed.
4 changes: 2 additions & 2 deletions test/python/test_qasm_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ def inspect(node):
res_if = qasm_if.parse()
inspect(res_if)

def test_get_tokens(self):
def test_generate_tokens(self):
"""Test whether we get only valid tokens."""
qasm = Qasm(self.qasm_file_path)
for token in qasm.get_tokens():
for token in qasm.generate_tokens():
self.assertTrue(isinstance(token, ply.lex.LexToken))


Expand Down