Skip to content
This repository was archived by the owner on Apr 9, 2024. It is now read-only.

Merge develop to master for a new pypi release 1.0.2 #172

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0ab95a8
Merge branch 'release/1.0.1' into develop
gak Sep 17, 2013
fbd8fae
Potential fix for 2to3 too long line
gak Sep 17, 2013
35d6465
Removed pypy from travis tests because it kept segfaulting
gak Sep 17, 2013
22dbcc5
add module to let you group objects arbitrarily
logicabrity Feb 19, 2014
6176256
add example of custom grouping
logicabrity Feb 19, 2014
2c4ca0e
fix oversight in docstring
logicabrity Feb 19, 2014
24085f1
make changes PEP-8 compliant
logicabrity Feb 19, 2014
4c74bb4
add a blank line to pycallgraph/grouper.py
logicabrity Feb 19, 2014
9a2a76b
add main to __all__ so that flake8 won't complain about unused import
logicabrity Feb 19, 2014
5c51c51
remove unused import (was copy and pasted from filter example)
logicabrity Feb 19, 2014
89e9689
Merge pull request #124 from sMAshdot/develop
gak Feb 19, 2014
f437d43
Ensure all files in docs are part of the sdist.
Oct 12, 2014
8181f6d
Merge pull request #131 from alunduil/add-docs-to-sdist
gak Oct 12, 2014
99bf650
Make .format() work with older Python versions
atodorov Nov 6, 2014
fad968c
more format fixes
atodorov Nov 6, 2014
ea6563e
Removed "json" output mode from the docs, because it looks like json …
RobBednark Nov 18, 2014
c92539b
Fix graphviz output format setting
vmarkovtsev Nov 24, 2014
199036c
Merge pull request #136 from vmarkovtsev/patch-1
gak Dec 14, 2014
98e3b9c
Merge pull request #134 from atodorov/fix_format
gak Dec 14, 2014
a8cdae3
Merge pull request #135 from RobBednark/rbednark-rm-json-from-docs
gak Dec 14, 2014
e201d73
Make Readme badges uniform and SVG using shields.io
DavidJFelix Dec 29, 2014
9a3d29a
Merge pull request #137 from DavidJFelix/patch-1
gak Jan 4, 2015
1d8f276
decorators from @ivannotes
luzfcb Mar 5, 2015
ac293eb
pep8 and add newline
luzfcb Mar 5, 2015
f751b95
pep8
luzfcb Mar 5, 2015
db347c1
renamed decorator from "pycall_profile" to "trace"
luzfcb May 28, 2015
ee33d76
test with python 3.5-dev nightly builds and pypy
luzfcb May 28, 2015
475fbd7
fix .travis.yml
luzfcb May 28, 2015
09ef7fa
fix .travis.yml
luzfcb May 28, 2015
0732a01
Merge pull request #140 from luzfcb/add-decorator
gak May 28, 2015
d23f9a4
[Bugfix] Allow spaces in tool path
rgom Jun 12, 2015
b0ca068
Merge pull request #144 from rgom/spaces_in_names_fix
gak Jun 12, 2015
f552d41
Update readme with a typo correction.
BorisVa Aug 20, 2015
dd354b3
Merge pull request #146 from BorisVa/patch-1
gak Aug 21, 2015
613ce31
Proper way of running system calls http://stackoverflow.com/a/3791476…
Aug 28, 2015
6c0f0e1
Merge pull request #147 from seperman/develop
gak Aug 28, 2015
015ec14
Update .travis.yaml
rbubley Mar 15, 2017
55ee009
Merge pull request #168 from rbubley/patch-1
gak Mar 15, 2017
f395ce9
Fix decorator implementation and import. Document use of decorators i…
abenassi Jul 13, 2017
924eab3
Merge branch 'develop'
abenassi Jul 13, 2017
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
Prev Previous commit
Next Next commit
make changes PEP-8 compliant
logicabrity committed Feb 19, 2014
commit 24085f1295bd6b16c022f014f2c1b42cf5e47f53
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from submodule_one import SubmoduleOne
from submodule_two import SubmoduleTwo


def main():
s1 = SubmoduleOne()
s1.report()
1 change: 1 addition & 0 deletions examples/graphviz/example_with_submodules/submodule_two.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from helpers import helper


class SubmoduleTwo(object):
def __init__(self):
self.two = 2
4 changes: 2 additions & 2 deletions pycallgraph/grouper.py
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ class Grouper(object):
'''Group module names.
By default, objects are grouped by their top-level module name. Additional
groups can be specified with the groups list and all objects will be matched
against it.
groups can be specified with the groups list and all objects will be
matched against it.
'''

def __init__(self, groups=None):