Skip to content

Py3K fix for -i option #26

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

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

Py3K fix for -i option #26

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb937c
Py3K fix for -i option
mayfield Aug 4, 2015
dbb2e22
Fix for unicode handling in Py3K.
mayfield Aug 4, 2015
2445e6a
Use PEP 263 encoding detection in Py3k.
mayfield Aug 5, 2015
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
23 changes: 10 additions & 13 deletions pycscope/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
-f reffile Use 'reffile' as cross-ref file name instead of 'cscope.out'
-i srclistfile Use the contents of 'srclistfile' as the list of source files to scan"""

import getopt, sys, os, string, re
import getopt, sys, os, re
import keyword, parser, symbol, token
import tokenize


class Mark(object):
Expand Down Expand Up @@ -117,7 +118,8 @@ def main(argv=None):
if o == "-f":
indexfn = a
if o == "-i":
args.extend(list(map(string.rstrip, open(a, 'r').readlines())))
with open(a) as f:
args.extend(x.rstrip() for x in f)

# Search current dir by default
if len(args) == 0:
Expand Down Expand Up @@ -148,7 +150,7 @@ def writeIndex(basepath, fout, indexbuff, fnamesbuff):
"""
# Write the header and index
index = ''.join(indexbuff)
index_len = len(index)
index_len = len(index.encode() if isinstance(u'' , str) else index)
hdr_len = len(basepath) + 25
fout.write("cscope 15 %s -c %010d" % (basepath, hdr_len + index_len))
fout.write(index)
Expand All @@ -175,7 +177,8 @@ def work(basepath, gen, debug):
indexbuff_len = parseFile(basepath, fname, indexbuff, indexbuff_len, fnamesbuff, dump=debug)
except (SyntaxError, AssertionError) as e:
print("pycscope.py: %s: Line %s: %s" % (e.filename, e.lineno, e))
pass
except Exception as e:
print("pycscope.py: %s: %s" % (fname, e))

return indexbuff, fnamesbuff

Expand Down Expand Up @@ -221,15 +224,9 @@ def parseFile(basepath, relpath, indexbuff, indexbuff_len, fnamesbuff, dump=Fals
"""
# Open the file and get the contents
fullpath = os.path.join(basepath, relpath)
try:
f = open(fullpath, 'rU')
except IOError as e:
# Can't open a file, emit message and ignore
print("pycscope.py: %s" % e)
return indexbuff_len
filecontents = f.read()
f.close()

bestopen = getattr(tokenize, 'open', open)
with bestopen(fullpath) as f:
filecontents = f.read()
# Add the file mark to the index
fnamesbuff.append(relpath)
indexbuff.append("\n%s%s\n\n" % (Mark(Mark.FILE), relpath))
Expand Down