@@ -6,9 +6,9 @@
 
 -----
 
-*The project needs maintainers and contributors*
+*The project needs contributors*
 
-Slack Channel: https://python-mode.herokuapp.com/
+** Python-mode Slack Channel is here: https://python-mode.herokuapp.com/ **
 
 -----
 
@@ -180,7 +180,10 @@ at https://github.com/klen/python-mode/issues
 Contributing
 ============
 
-See the `AUTHORS` file.
+* Kirill Klenov (horneds@gmail.com)
+* Bryce Guinta (https://github.com/brycepg)
+
+Also see the `AUTHORS` file.
 
 Development of python-mode happens at github:
 https://github.com/klen/python-mode
 
@@ -5,4 +5,4 @@ linters=pep8,pyflakes,pylint
 skip=1
 
 [pylama:pylint]
-disable=E1120,E1130,E1103,W1401
+disable=E1120,E1130,E1103,W1401,F0001
@@ -1,8 +1,9 @@
 """rope, a python refactoring library"""
 
 INFO = __doc__
-VERSION = '0.10.2'
+VERSION = '0.10.3'
 COPYRIGHT = """\
+Copyright (C) 2014-2015 Matej Cepl
 Copyright (C) 2006-2012 Ali Gholami Rudi
 Copyright (C) 2009-2012 Anton Gritsay
 
 
@@ -3,18 +3,23 @@
 
 from rope.base import fscommands
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
 
 def parse(source, filename='<string>'):
     # NOTE: the raw string should be given to `compile` function
     if isinstance(source, unicode):
         source = fscommands.unicode_to_file_data(source)
-    if '\r' in source:
-        source = source.replace('\r\n', '\n').replace('\r', '\n')
-    if not source.endswith('\n'):
-        source += '\n'
+    if b'\r' in source:
+        source = source.replace(b'\r\n', b'\n').replace(b'\r', b'\n')
+    if not source.endswith(b'\n'):
+        source += b'\n'
     try:
         return compile(source, filename, 'exec', _ast.PyCF_ONLY_AST)
-    except (TypeError, ValueError), e:
+    except (TypeError, ValueError) as e:
         error = SyntaxError()
         error.lineno = 1
         error.filename = filename
 
@@ -40,6 +40,9 @@ def _added(self, node, levels):
     def _Name(self, node):
         self._add_node(node)
 
+    def _ExceptHandler(self, node):
+        self.names.append((node.name, []))
+
     def _Tuple(self, node):
         new_levels = []
         if self.levels is not None:
 
@@ -1,8 +1,13 @@
 """This module trys to support builtin types and functions."""
 import inspect
+try:
+    raw_input
+except NameError:
+    raw_input = input
 
 import rope.base.evaluate
-from rope.base import pynames, pyobjects, arguments, utils, ast
+from rope.base.utils import pycompat
+from rope.base import pynames, pyobjects, arguments, utils
 
 
 class BuiltinModule(pyobjects.AbstractModule):
@@ -32,7 +37,7 @@ def attributes(self):
         result.update(self.initial)
         if self.pycore is not None:
             submodules = self.pycore._builtin_submodules(self.name)
-            for name, module in submodules.iteritems():
+            for name, module in submodules.items():
                 result[name] = rope.base.builtins.BuiltinName(module)
         return result
 
@@ -266,7 +271,10 @@ def __init__(self, holding=None):
         # Getting methods
         collector('__getitem__', function=self._list_get)
         collector('pop', function=self._list_get)
-        collector('__getslice__', function=self._self_get)
+        try:
+            collector('__getslice__', function=self._list_get)
+        except AttributeError:
+            pass
 
         super(List, self).__init__(list, collector.attributes)
 
@@ -290,6 +298,10 @@ def _self_set(self, context):
 
     def _list_get(self, context):
         if self.holding is not None:
+            args = context.get_arguments(['self', 'key'])
+            if (len(args) > 1 and args[1] is not None and
+                    args[1].get_type() == builtins['slice'].get_object()):
+                return get_list(self.holding)
             return self.holding
         return context.get_per_name()
 
@@ -407,7 +419,7 @@ def __init__(self, *objects):
         if objects:
             first = objects[0]
         attributes = {
-            '__getitem__': BuiltinName(BuiltinFunction(first)),
+            '__getitem__': BuiltinName(BuiltinFunction(first)),  # TODO: add slice support
             '__getslice__':
             BuiltinName(BuiltinFunction(pyobjects.PyObject(self))),
             '__new__': BuiltinName(BuiltinFunction(function=self._new_tuple)),
@@ -487,14 +499,21 @@ def __init__(self):
         collector = _AttributeCollector(str)
         collector('__iter__', get_iterator(self_object), check_existence=False)
 
-        self_methods = ['__getitem__', '__getslice__', 'capitalize', 'center',
-                        'decode', 'encode', 'expandtabs', 'join', 'ljust',
+        self_methods = ['__getitem__', 'capitalize', 'center',
+                        'encode', 'expandtabs', 'join', 'ljust',
                         'lower', 'lstrip', 'replace', 'rjust', 'rstrip',
                         'strip', 'swapcase', 'title', 'translate', 'upper',
                         'zfill']
         for method in self_methods:
             collector(method, self_object)
 
+        py2_self_methods = ["__getslice__", "decode"]
+        for method in py2_self_methods:
+            try:
+                collector(method, self_object)
+            except AttributeError:
+                pass
+
         for method in ['rsplit', 'split', 'splitlines']:
             collector(method, get_list(self_object))
 
@@ -568,7 +587,7 @@ def __init__(self):
         attributes = {}
 
         def add(name, returned=None, function=None):
-            builtin = getattr(file, name, None)
+            builtin = getattr(open, name, None)
             attributes[name] = BuiltinName(
                 BuiltinFunction(returned=returned, function=function,
                                 builtin=builtin))
@@ -578,7 +597,7 @@ def add(name, returned=None, function=None):
         for method in ['close', 'flush', 'lineno', 'isatty', 'seek', 'tell',
                        'truncate', 'write', 'writelines']:
             add(method)
-        super(File, self).__init__(file, attributes)
+        super(File, self).__init__(open, attributes)
 
 
 get_file = _create_builtin_getter(File)
@@ -642,12 +661,12 @@ def get_name(self):
         return 'lambda'
 
     def get_param_names(self, special_args=True):
-        result = [node.id for node in self.arguments.args
-                  if isinstance(node, ast.Name)]
+        result = [pycompat.get_ast_arg_arg(node) for node in self.arguments.args
+                  if isinstance(node, pycompat.ast_arg_type)]
         if self.arguments.vararg:
-            result.append('*' + self.arguments.vararg)
+            result.append('*' + pycompat.get_ast_arg_arg(self.arguments.vararg))
         if self.arguments.kwarg:
-            result.append('**' + self.arguments.kwarg)
+            result.append('**' + pycompat.get_ast_arg_arg(self.arguments.kwarg))
         return result
 
     @property
@@ -787,4 +806,4 @@ def _input_function(args):
                              builtin=raw_input)),
 }
 
-builtins = BuiltinModule('__builtin__', initial=_initial_builtins)
+builtins = BuiltinModule(pycompat.builtins.__name__, initial=_initial_builtins)
@@ -369,7 +369,7 @@ def _create_resource(self, file_name, kind='file'):
                 fscommands.create_file(resource_path)
             else:
                 fscommands.create_folder(resource_path)
-        except IOError, e:
+        except IOError as e:
             raise exceptions.RopeError(e)
 
 
 
@@ -19,9 +19,7 @@ def get_changed(self):
         if not self.changes:
             return None
 
-        def compare_changes(change1, change2):
-            return cmp(change1[:2], change2[:2])
-        self.changes.sort(compare_changes)
+        self.changes.sort(key=lambda x: x[:2])
         pieces = []
         last_changed = 0
         for change in self.changes:
@@ -131,31 +129,31 @@ def __call__(self):
                 i += 1
         return result
 
-    _main_chars = re.compile(r'[\'|"|#|\\|\[|\]|\{|\}|\(|\)]')
+    # Matches all backslashes before the token, to detect escaped quotes
+    _main_tokens = re.compile(r'(\\*)((\'\'\'|"""|\'|")|#|\[|\]|\{|\}|\(|\))')
 
     def _analyze_line(self, line):
-        char = None
-        for match in self._main_chars.finditer(line):
-            char = match.group()
-            i = match.start()
-            if char in '\'"':
+        token = None
+        for match in self._main_tokens.finditer(line):
+            prefix = match.group(1)
+            token = match.group(2)
+            # Skip any tokens which are escaped
+            if len(prefix) % 2 == 1:
+                continue
+            if token in ["'''", '"""', "'", '"']:
                 if not self.in_string:
-                    self.in_string = char
-                    if char * 3 == line[i:i + 3]:
-                        self.in_string = char * 3
-                elif self.in_string == line[i:i + len(self.in_string)] and \
-                    not (i > 0 and line[i - 1] == '\\' and
-                         not (i > 1 and line[i - 2] == '\\')):
+                    self.in_string = token
+                elif self.in_string == token:
                     self.in_string = ''
             if self.in_string:
                 continue
-            if char == '#':
+            if token == '#':
                 break
-            if char in '([{':
+            if token in '([{':
                 self.open_count += 1
-            elif char in ')]}':
+            elif token in ')]}':
                 self.open_count -= 1
-        if line and char != '#' and line.endswith('\\'):
+        if line and token != '#' and line.endswith('\\'):
             self.continuation = True
         else:
             self.continuation = False
@@ -177,7 +175,7 @@ def logical_line_in(self, line_number):
             block_start = get_block_start(self.lines, line_number, indents)
             try:
                 return self._block_logical_line(block_start, line_number)
-            except IndentationError, e:
+            except IndentationError as e:
                 tries += 1
                 if tries == 5:
                     raise e
@@ -222,7 +220,7 @@ def _calculate_logical(self, readline, line_number):
                 if line_number <= end:
                     return (start, end)
                 last_end = end + 1
-        except tokenize.TokenError, e:
+        except tokenize.TokenError as e:
             current = e.args[1][0]
             return (last_end, max(last_end, current - 1))
         return (last_end, None)