Skip to content

Commit 32d20c4

Browse files
Merge pull request wangzheng0822#257 from alouhaha/patch-2
remove wrong code, add dequene() return
2 parents 67b6efd + f36eb15 commit 32d20c4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

python/09_queue/array_queue.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ def enqueue(self, item: str) -> bool:
2121
return False
2222
else:
2323
for i in range(0, self._tail - self._head):
24-
<<<<<<< HEAD
25-
self._data[i] = self._items[i + self._head]
26-
=======
2724
self._items[i] = self._items[i + self._head]
28-
>>>>>>> upstream/master
2925
self._tail = self._tail - self._head
3026
self._head = 0
3127

@@ -38,6 +34,8 @@ def dequeue(self) -> Optional[str]:
3834
item = self._items[self._head]
3935
self._head += 1
4036
return item
37+
else:
38+
return None
4139

4240
def __repr__(self) -> str:
4341
return " ".join(item for item in self._items[self._head : self._tail])

0 commit comments

Comments
 (0)