Skip to content

Add 3.14 support #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andrewboltachev wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −18
Draft

Add 3.14 support #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Empty file added __init__.py
View file
Open in desktop
Empty file.
22 changes: 11 additions & 11 deletions flake8_string_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ def _add_node(self, node):
self.nodes += [node]

def is_base_string(self, node):
typ = (ast.Str,)
if sys.version_info[0] > 2:
typ += (ast.Bytes,)
typ = (ast.Constant,)
#if sys.version_info[0] > 2:
# typ += (ast.Bytes,)
return isinstance(node, typ)

def visit_Str(self, node):
# Constant with Python 3.8 uses the value-property
node.value = node.s
self._add_node(node)
# def visit_Constant(self, node):
# # Constant with Python 3.8 uses the value-property
# node.value = node.s
# self._add_node(node)

def visit_Bytes(self, node):
# Constant with Python 3.8 uses the value-property
node.value = node.s
self._add_node(node)
# def visit_Bytes(self, node):
# # Constant with Python 3.8 uses the value-property
# node.value = node.s
# self._add_node(node)

def visit_Constant(self, node):
if type(node.value) in (str, bytes):
Expand Down
15 changes: 8 additions & 7 deletions test_flake8_string_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from collections import defaultdict
from subprocess import Popen, PIPE

import six
#import six

import flake8_string_format

Expand Down Expand Up @@ -248,8 +248,8 @@ def defaults(self):
return defaults


@six.add_metaclass(ManualFileMetaClass)
class TestManualFiles(SimpleImportTestCase):
#@six.add_metaclass(ManualFileMetaClass)
class TestManualFiles(SimpleImportTestCase, metaclass=ManualFileMetaClass):

"""Test the manually created files in tests/files/."""

Expand Down Expand Up @@ -289,13 +289,14 @@ def run_test(self, positions, filename, content):

stdout_lines = stdout.decode('utf8').splitlines()

print(stderr)
self.assertEqual(stderr, b'')
self.compare_results(
self.iterator(stdout_lines, expected_filename), positions)


@six.add_metaclass(ManualFileMetaClass)
class TestFlake8Files(Flake8CaseBase):
#@six.add_metaclass(ManualFileMetaClass)
class TestFlake8Files(Flake8CaseBase, metaclass=ManualFileMetaClass):

def run_test(self, positions, tree, filename):
"""Test using stdin."""
Expand All @@ -308,8 +309,8 @@ def test_dynamic(self):
self.run_test(dynamic_positions, None, dynamic_code.encode('utf8'))


@six.add_metaclass(ManualFileMetaClass)
class TestFlake8Stdin(Flake8CaseBase):
#@six.add_metaclass(ManualFileMetaClass)
class TestFlake8Stdin(Flake8CaseBase, metaclass=ManualFileMetaClass):

def run_test(self, positions, tree, filename):
"""Test using stdin."""
Expand Down