diff --git a/IntegrationTest.py b/IntegrationTest.py index 79184f52..1351661d 100644 --- a/IntegrationTest.py +++ b/IntegrationTest.py @@ -6,11 +6,16 @@ import GithubCredentials g = Github( GithubCredentials.login, GithubCredentials.password ) u = g.get_user() -print u.login, u.name -print u.get_repos() +print u.login, "(" + u.name + ")" +for r in u.get_repos(): + print " ", r.name, + if r.fork: + print "<-", r.parent.owner.login + "/" + r.parent.name, + print "<-", r.source.owner.login + "/" + r.source.name, + print print u = g.get_user( "nvie" ) print u.login, u.name -print u.get_repos() +print ", ".join( r.name for r in u.get_repos() ) print diff --git a/github/Github.py b/github/Github.py index f255e71b..19a4061d 100644 --- a/github/Github.py +++ b/github/Github.py @@ -2,7 +2,7 @@ import urllib2 import json import base64 -from User import AuthenticatedUser, NamedUser +from GithubObjects import * class Github: def __init__( self, login, password ): diff --git a/github/User.py b/github/GithubObjects.py similarity index 88% rename from github/User.py rename to github/GithubObjects.py index c17d783c..36d90cd7 100644 --- a/github/User.py +++ b/github/GithubObjects.py @@ -30,13 +30,15 @@ Repository = GithubObject( "url", "html_url", "clone_url", "git_url", "ssh_url", "svn_url", "name", "description", "homepage", "language", "private", "fork", "forks", "watchers", "size", "master_branch", "open_issues", - "pushed_at", "created_at", "organization", "parent", "source", + "pushed_at", "created_at", "organization", "has_issues", "has_wiki", "has_downloads", # Not documented "mirror_url", "updated_at", "id", ), ExtendedScalarAttribute( "owner", NamedUser ), ) +Repository._addAttributePolicy( ExtendedScalarAttribute( "parent", Repository ) ) +Repository._addAttributePolicy( ExtendedScalarAttribute( "source", Repository ) ) AuthenticatedUser._addAttributePolicy( ExtendedListAttribute( "repos", Repository ) ) NamedUser._addAttributePolicy( ExtendedListAttribute( "repos", Repository ) )