Replaces integer with int in types and rtypes.

[tswast]

Sister PR to #2579

[dhermes]

LGTM.

1. Do you have more of these coming?
2. Do you feel like tackling all of the NoneType / None, etc.? (For params, when None is allowed I typically put "(Optional) The foo that bars" but for return values I'm not sure.

[tswast]

Re: 1. This was the last one from @jonparrott's comments on #2485 The only other possible error for a built-in type I think of is dictionary instead of dict, but the silver surfer regex command ag 'type ([^:]+): dictionary' . doesn't find any of those.

Re: 2. That one might be a little tougher to automate. These PRs only modified a single line. I'll see what I can do.

[tswast]

This regex does a pretty good job of finding them.

ag 'type ([^:]+): [^\s]+\s*,?\s*(or\s*)?(``None``|``NoneType``|None|NoneType|:class:`NoneType`)' .

Piping that through wc -l, I see there are 390 instances. Definitely worth scripting a fix.

[dhermes]

Nice, thanks! I'd imagine there will be 300/390 that could also have their prose updated with the "(Optional) " qualifier at the front, so maybe not worth it?

[tswast]

I've got a script that mostly works. Should only require a bit of manual clean-up after it runs to get it to pass the linter again. A cursory look at the diff it generates, it looks like there are very view params with both NoneType and (Optional).

# Copyright 2016 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Run this with:
#  ag -l 'type ([^:]+): [^\s]+\s*,?\s*(or\s*)?(``None``|``NoneType``|None|NoneType|:class:`NoneType`)' | xargs python ~/Desktop/cleannone.py

import codecs
import re
import shutil
import sys

def replace():
    pass

def main(paths):
    for path in paths:
        # Move to a backup location to edit path in-place.
        shutil.move(path, path + '.bak')

        with codecs.open(path + '.bak', 'r', 'utf-8') as f, codecs.open(path, 'w', 'utf-8') as outf:
            lastlinematched = False
            for line in f:
                if lastlinematched:
                    # Insert (Optional) in front of param.
                    indent, param, end = line.split(':', 2)
                    line = indent + ':' + param + ': (Optional)' + end
                lastlinematched = re.search('type ([^:]+): [^\s]+\s*,?\s*(or\s*)?(``None``|``NoneType``|None|NoneType|:class:`NoneType`)', line)
                if lastlinematched:
                    print 'matched'
                    # Delete the "or None" part of the line.
                    line = re.sub(',?\s*(or\s*)?(``None``|``NoneType``|None|NoneType|:class:`NoneType`)', '', line)
                outf.write(line)

if __name__ == '__main__':
    main(sys.argv[1:])

I will wait until after this and the string PR go in, because it also looks like there will be lots of conflicts.

[dhermes]

Holy script! Looking forward to the diff.