Skip to content

txt2tags for python3 #8734 #9648

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

Merged
michaelDCurran merged 6 commits into from
Jun 11, 2019
Merged

txt2tags for python3 #8734 #9648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adcfdea
txt2tags for python3 #8734
nishimotz May 31, 2019
e32fa0e
address review comments
nishimotz May 31, 2019
3070fcc
address review comments
nishimotz May 31, 2019
befffdd
address review comments. revert miscDeps
nishimotz May 31, 2019
3824709
address review comment #9648
nishimotz Jun 4, 2019
c7c1cc5
Update miscDeps to master containing python3 txt2tags.
michaelDCurran Jun 11, 2019
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
8 changes: 4 additions & 4 deletions keyCommandsDoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#A part of NonVisual Desktop Access (NVDA)
#This file is covered by the GNU General Public License.
#See the file COPYING for more details.
#Copyright (C) 2010-2015 NV Access Limited, Mesar Hameed
#Copyright (C) 2010-2019 NV Access Limited, Mesar Hameed, Takuya Nishimoto

"""Utilities related to NVDA Key Commands documents.
"""
Expand Down Expand Up @@ -213,7 +213,7 @@ def _heading(self, m):
self._headings.append(m)
self._kcLastHeadingLevel = min(self._kcLastHeadingLevel, level - 1)

RE_SETTING_SINGLE_KEY = re.compile(ur"^[^|]+?[:：]\s*(.+?)\s*$")
RE_SETTING_SINGLE_KEY = re.compile(r"^[^|]+?[:：]\s*(.+?)\s*$")
def _handleSetting(self):
if not self._settingsHeaderRow:
raise KeyCommandsError("%d, setting command cannot be used before settingsSection command" % self._lineNum)
Expand All @@ -237,7 +237,7 @@ def _handleSetting(self):
# The next few lines should be table rows for each layout.
# Alternatively, if the key is common to all layouts, there will be a single line of text specifying the key after a colon.
keys = []
for layout in xrange(self._settingsNumLayouts):
for layout in range(self._settingsNumLayouts):
line = next(self._ug).strip()
self._lineNum += 1
m = self.RE_SETTING_SINGLE_KEY.match(line)
Expand All @@ -254,7 +254,7 @@ def _handleSetting(self):
if 1 == len(keys) < self._settingsNumLayouts:
# The key has only been specified once, so it is the same in all layouts.
key = keys[0]
keys[1:] = (key for layout in xrange(self._settingsNumLayouts - 1))
keys[1:] = (key for layout in range(self._settingsNumLayouts - 1))

# There should now be a blank line.
line = next(self._ug).strip()
Expand Down
2 changes: 1 addition & 1 deletion miscDeps
Open in desktop
Submodule miscDeps updated 371 files