Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion examples/pylink-rtt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import pylink
import argparse
import sys
import time
from six.moves import input

try:
import thread
Expand Down
6 changes: 1 addition & 5 deletions pylink/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
import logging
import os
import sys
try:
from six.moves import with_metaclass
except (AttributeError, ImportError):
from six import with_metaclass


class CommandMeta(type):
Expand Down Expand Up @@ -52,7 +48,7 @@ def __new__(cls, name, parents, dct):
return newClass


class Command(with_metaclass(CommandMeta)):
class Command(metaclass=CommandMeta):
"""Base command-class.

All commands should inherit from this class.
Expand Down
11 changes: 5 additions & 6 deletions pylink/jlink.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import os
import sys
import time
import six


logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -429,7 +428,7 @@ def _get_register_index_from_name(self, register):
``int``
"""
regs = list(self.register_name(idx) for idx in self.register_list())
if isinstance(register, six.string_types):
if isinstance(register, str):
try:
result = regs.index(register)
except ValueError:
Expand Down Expand Up @@ -3480,7 +3479,7 @@ def register_read(self, register_index):
The value stored in the given register.
"""
# TODO: rename 'register_index' to 'register'
if isinstance(register_index, six.string_types):
if isinstance(register_index, str):
register_index = self._get_register_index_from_name(register_index)
return self._dll.JLINKARM_ReadReg(register_index)

Expand All @@ -3504,7 +3503,7 @@ def register_read_multiple(self, register_indices):
register_indices = register_indices[:]
num_regs = len(register_indices)
for idx, indice in enumerate(register_indices):
if isinstance(indice, six.string_types):
if isinstance(indice, str):
register_indices[idx] = self._get_register_index_from_name(indice)
buf = (ctypes.c_uint32 * num_regs)(*register_indices)
data = (ctypes.c_uint32 * num_regs)(0)
Expand Down Expand Up @@ -3539,7 +3538,7 @@ def register_write(self, reg_index, value):
JLinkException: on write error.
"""
# TODO: rename 'reg_index' to 'register'
if isinstance(reg_index, six.string_types):
if isinstance(reg_index, str):
reg_index = self._get_register_index_from_name(reg_index)
res = self._dll.JLINKARM_WriteReg(reg_index, value)
if res != 0:
Expand Down Expand Up @@ -3573,7 +3572,7 @@ def register_write_multiple(self, register_indices, values):

num_regs = len(register_indices)
for idx, indice in enumerate(register_indices):
if isinstance(indice, six.string_types):
if isinstance(indice, str):
register_indices[idx] = self._get_register_index_from_name(indice)
buf = (ctypes.c_uint32 * num_regs)(*register_indices)
data = (ctypes.c_uint32 * num_regs)(*values)
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ summary = True
psutil>=5.2.2
pycodestyle>=2.3.1
setuptools>=70.2.0
six
sphinx==1.4.8
sphinx-argparse==0.1.15
sphinx_rtd_theme==0.2.4
Expand Down
6 changes: 0 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
except ImportError:
sys.modules['psutil'] = {}

try:
import six
except ImportError:
sys.modules['six'] = {}

import pylink

import os
Expand Down Expand Up @@ -261,7 +256,6 @@ def long_description():
# Dependencies.
install_requires=[
'psutil >= 5.2.2',
'six'
],

# Tests
Expand Down
Loading