FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Use iter* from six · studiovc/bpython@d513d3a · GitHub

/ bpython Public
forked from bpython/bpython

Commit d513d3a

Browse files
sebastinas
committed
Use iter* from six
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
1 parent 7064858 commit d513d3a

6 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎bpython/config.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import sys
66
import locale
77
from itertools import chain
8+
from six import iterkeys, iteritems
9+
810
from bpython.keys import cli_key_dispatch as key_dispatch
911
from bpython.autocomplete import SIMPLE as default_completion
1012
import bpython.autocomplete
@@ -48,11 +50,11 @@ def default_config_path():
4850

4951

5052
def fill_config_with_default_values(config, default_values):
51-
for section in default_values.iterkeys():
53+
for section in iterkeys(default_values):
5254
if not config.has_section(section):
5355
config.add_section(section)
5456

55-
for (opt, val) in default_values[section].iteritems():
57+
for (opt, val) in iteritems(default_values[section]):
5658
if not config.has_option(section, opt):
5759
config.set(section, opt, str(val))
5860

@@ -130,7 +132,7 @@ def loadini(struct, configfile):
130132
}}
131133

132134
default_keys_to_commands = dict((value, key) for (key, value)
133-
in defaults['keyboard'].iteritems())
135+
in iteritems(defaults['keyboard']))
134136

135137
fill_config_with_default_values(config, defaults)
136138
if not config.read(config_path):
@@ -307,6 +309,6 @@ def load_theme(struct, path, colors, default_colors):
307309
colors[k] = theme.get('interface', k)
308310

309311
# Check against default theme to see if all values are defined
310-
for k, v in default_colors.iteritems():
312+
for k, v in iteritems(default_colors):
311313
if k not in colors:
312314
colors[k] = v

‎bpython/curtsiesfrontend/interpreter.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import code
22
import traceback
33
import sys
4+
from codeop import CommandCompiler
5+
from six import iteritems
6+
47
from pygments.token import Generic, Token, Keyword, Name, Comment, String
58
from pygments.token import Error, Literal, Number, Operator, Punctuation
69
from pygments.token import Whitespace
710
from pygments.formatter import Formatter
8-
from bpython.curtsiesfrontend.parse import parse
9-
from bpython.repl import RuntimeTimer
10-
from codeop import CommandCompiler
1111
from pygments.lexers import get_lexer_by_name
1212

13+
from bpython.curtsiesfrontend.parse import parse
14+
from bpython.repl import RuntimeTimer
1315

1416
default_colors = {
1517
Generic.Error:'R',
@@ -45,7 +47,7 @@ class BPythonFormatter(Formatter):
4547

4648
def __init__(self, color_scheme, **options):
4749
self.f_strings = {}
48-
for k, v in color_scheme.iteritems():
50+
for k, v in iteritems(color_scheme):
4951
self.f_strings[k] = '\x01%s' % (v,)
5052
Formatter.__init__(self, **options)
5153

‎bpython/curtsiesfrontend/repl.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ def send_current_block_to_external_editor(self, filename=None):
723723

724724
def send_session_to_external_editor(self, filename=None):
725725
for_editor = u'### current bpython session - file will be reevaluated, ### lines will not be run\n'
726-
for_editor += '\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
726+
for_editor += u'\n'.join(line[len(self.ps1):] if line.startswith(self.ps1) else
727727
(line[len(self.ps2):] if line.startswith(self.ps2) else
728728
'### '+line)
729729
for line in self.getstdout().split('\n'))

‎bpython/formatter.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from pygments.formatter import Formatter
2828
from pygments.token import Keyword, Name, Comment, String, Error, \
2929
Number, Operator, Token, Whitespace, Literal, Punctuation
30+
from six import iteritems
3031

3132
"""These format strings are pretty ugly.
3233
\x01 represents a colour marker, which
@@ -85,7 +86,7 @@ class BPythonFormatter(Formatter):
8586

8687
def __init__(self, color_scheme, **options):
8788
self.f_strings = {}
88-
for k, v in theme_map.iteritems():
89+
for k, v in iteritems(theme_map):
8990
self.f_strings[k] = '\x01%s' % (color_scheme[v],)
9091
if k is Parenthesis:
9192
# FIXME: Find a way to make this the inverse of the current

‎bpython/repl.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
from itertools import takewhile
4141
from locale import getpreferredencoding
4242
from string import Template
43+
from six import itervalues
4344

4445
from pygments.token import Token
4546

@@ -958,7 +959,7 @@ def tokenize(self, s, newline=False):
958959
else:
959960
stack.append((line, len(line_tokens) - 1,
960961
line_tokens, value))
961-
elif value in parens.itervalues():
962+
elif value in itervalues(parens):
962963
saved_stack = list(stack)
963964
try:
964965
while True:

‎bpython/urwid.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
from types import ModuleType
4444
from optparse import Option
4545
from six.moves import range
46+
from six import iteritems
4647

4748
from pygments.token import Token
4849

@@ -1151,7 +1152,7 @@ def main(args=None, locals_=None, banner=None):
11511152
palette = [
11521153
(name, COLORMAP[color.lower()], 'default',
11531154
'bold' if color.isupper() else 'default')
1154-
for name, color in config.color_scheme.iteritems()]
1155+
for name, color in iteritems(config.color_scheme)]
11551156
palette.extend([
11561157
('bold ' + name, color + ',bold', background, monochrome)
11571158
for name, color, background, monochrome in palette])

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL