Skip to content

Migrate from Python 2 to Python 3 #20

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
SoundBlaster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate from Python 2 to Python 3 #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions objc_dep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import sys
import os
from sets import Set
import re
from os.path import basename
import argparse
Expand Down Expand Up @@ -61,7 +60,7 @@ def dependencies_in_project(path, ext, exclude, ignore, system, extensions):
continue

if filename not in d:
d[filename] = Set()
d[filename] = set()

path = os.path.join(root, f)

Expand All @@ -78,9 +77,9 @@ def dependencies_in_project_with_file_extensions(path, exts, exclude, ignore, sy

for ext in exts:
d2 = dependencies_in_project(path, ext, exclude, ignore, system, extensions)
for (k, v) in d2.iteritems():
for (k, v) in d2.items():
if not k in d:
d[k] = Set()
d[k] = set()
d[k] = d[k].union(v)

if root_class:
Expand All @@ -102,11 +101,11 @@ def parse_requirements(tree, root, known_deps=[]):

def two_ways_dependencies(d):

two_ways = Set()
two_ways = set()

# d is {'a1':[b1, b2], 'a2':[b1, b3, b4], ...}

for a, l in d.iteritems():
for a, l in d.items():
for b in l:
if b in d and a in d[b]:
if (a, b) in two_ways or (b, a) in two_ways:
Expand All @@ -118,9 +117,9 @@ def two_ways_dependencies(d):

def untraversed_files(d):

dead_ends = Set()
dead_ends = set()

for file_a, file_a_dependencies in d.iteritems():
for file_a, file_a_dependencies in d.items():
for file_b in file_a_dependencies:
if not file_b in dead_ends and not file_b in d:
dead_ends.add(file_b)
Expand All @@ -131,7 +130,7 @@ def category_files(d):
d2 = {}
l = []

for k, v in d.iteritems():
for k, v in d.items():
if not v and '+' in k:
l.append(k)
else:
Expand All @@ -142,27 +141,28 @@ def category_files(d):
def referenced_classes_from_dict(d):
d2 = {}

for k, deps in d.iteritems():
for k, deps in d.items():
for x in deps:
d2.setdefault(x, Set())
d2.setdefault(x, set())
d2[x].add(k)

return d2

def print_frequencies_chart(d):

lengths = map(lambda x:len(x), d.itervalues())
lengths = map(lambda x:len(x), d.values())
if not lengths: return
max_length = max(lengths)

lengths_list = list(lengths)

for i in range(0, max_length+1):
s = "%2d | %s\n" % (i, '*'*lengths.count(i))
s = "%2d | %s\n" % (i, '*'*lengths_list.count(i))
sys.stderr.write(s)

sys.stderr.write("\n")

l = [Set() for i in range(max_length+1)]
for k, v in d.iteritems():
l = [set() for i in range(max_length+1)]
for k, v in d.items():
l[len(v)].add(k)

for i in range(0, max_length+1):
Expand Down Expand Up @@ -195,7 +195,7 @@ def dependencies_in_dot_format(path, exclude, ignore, system, extensions, root_c
l.append("digraph G {")
l.append("\tnode [shape=box];")

for k, deps in d.iteritems():
for k, deps in d.items():
if deps:
deps.discard(k)

Expand All @@ -207,7 +207,7 @@ def dependencies_in_dot_format(path, exclude, ignore, system, extensions, root_c
l.append("\t\"%s\" -> \"%s\";" % (k, k2))

l.append("\t")
for (k, v) in pch_set.iteritems():
for (k, v) in pch_set.items():
l.append("\t\"%s\" [color=red];" % k)
for x in v:
l.append("\t\"%s\" -> \"%s\" [color=red];" % (k, x))
Expand Down Expand Up @@ -247,7 +247,7 @@ def main():
args= parser.parse_args()

if not args.test:
print dependencies_in_dot_format(args.project_path, args.exclude, args.ignore, args.system, args.extensions, args.root)
print(dependencies_in_dot_format(args.project_path, args.exclude, args.ignore, args.system, args.extensions, args.root))
else:
# Test if two-way dependencies exist. If none do, then exit on success (0), otherwise exit on failure (1)
d = dependencies_in_project_with_file_extensions(args.project_path, objc_extensions, args.exclude, args.ignore, args.system, args.extensions, args.root)
Expand Down