Skip to content
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

Jump to bottom

Add QString to the replacement targets #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add QString to the replacement targets #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21a0ebf
fix_args: add `QString` to the replacement patterns
naufraghi Oct 19, 2018
d116d97
README: update the `fix_args` example to English and add QString
naufraghi Oct 19, 2018
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
22 changes: 12 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,21 +186,23 @@ For example:

Outputs:

~~~
root: Generating grammar tables from /usr/lib/python3.5/lib2to3/PatternGrammar.txt
~~~diff
RefactoringTool: Refactored example-args.py
--- example-args.py (original)
+++ example-args.py (refactored)
@@ -2,6 +2,6 @@

@@ -2,8 +2,8 @@
class Window(QLabel):
def foo(self, value, tr=None):
- self.tr("Messaggio %1").arg(self.getText()) # cose
- tr("Messaggio %1 e %2").arg(self.getText()).arg(value)
- qApp.translate("Messaggio %1 e %2").arg(self.getText(), value)
+ self.tr("Messaggio {0}").format(self.getText()) # cose
+ tr("Messaggio {0} e {1}").format(self.getText(), value)
+ qApp.translate("Messaggio {0} e {1}").format(self.getText(), value)
- self.tr("Message %1").arg(self.getText()) # some comment
- tr("Message %1 and %2").arg(self.getText()).arg(value)
- qApp.translate("Message %1 and %2").arg(self.getText(), value)
- QString("Message %1 and %2").arg(self.getText(), value)
- print(tr("Some message %1").arg(value))
+ self.tr("Message {0}").format(self.getText()) # some comment
+ tr("Message {0} and {1}").format(self.getText(), value)
+ qApp.translate("Message {0} and {1}").format(self.getText(), value)
+ ("Message {0} and {1}").format(self.getText(), value)
+ print(tr("Some message {0}").format(value))
RefactoringTool: Files that need to be modified:
RefactoringTool: example-args.py
~~~
Expand Down
10 changes: 6 additions & 4 deletions example-args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from PyQt4.Qt import (QLabel, qApp)
from PyQt4.Qt import (QLabel, QString, qApp)

class Window(QLabel):
def foo(self, value, tr=None):
self.tr("Messaggio %1").arg(self.getText()) # cose
tr("Messaggio %1 e %2").arg(self.getText()).arg(value)
qApp.translate("Messaggio %1 e %2").arg(self.getText(), value)
self.tr("Message %1").arg(self.getText()) # some comment
tr("Message %1 and %2").arg(self.getText()).arg(value)
qApp.translate("Message %1 and %2").arg(self.getText(), value)
QString("Message %1 and %2").arg(self.getText(), value)
print(tr("Some message %1").arg(value))
6 changes: 4 additions & 2 deletions my_fixes/fix_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class FixArgs(fixer_base.BaseFix):
PATTERN = """
power<
before=any*
tr=('tr' | 'translate') trailer< '(' message=any ')' >
tr=('tr' | 'translate' | 'QString') trailer< '(' message=any ')' >
{args}
rest=any*
>
Expand All @@ -38,9 +38,11 @@ class FixArgs(fixer_base.BaseFix):
def transform(self, node, results):
# before
before = [b.clone() for b in results['before']]
# tr | translate
# tr | translate | QString
tr = results['tr']
new_tr = [(tr[0] if isinstance(tr, list) else tr).clone()]
if isinstance(new_tr[0], Leaf) and new_tr[0].value == "QString":
new_tr = [] # remove QString, keep parentheses
# message
message = results['message'].clone()
for ch in (message.pre_order() if not isinstance(message, Leaf) else [message]):
Expand Down