From d4b966ab9613d8e7ed85b008fc1b44c3dcee34cd Mon Sep 17 00:00:00 2001
From: Langenfeld <langenfv@tf.uni-freiburg.de>
Date: Tue, 19 Feb 2019 10:51:01 +0100
Subject: [PATCH] small improvements

---
 __init__.py    |  0
 example.py     |  5 +++--
 gitea/Gitea.py | 20 +++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 __init__.py

diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/example.py b/example.py
index 5ff617e..79adef0 100644
--- a/example.py
+++ b/example.py
@@ -1,8 +1,9 @@
 import os
 
-from gitea import *
+from pygitea.gitea.gitea import *
 
-gitea = Gitea("https://test-gitea.something", "api-token")
+# put a ".token" file into your directory containg only the token
+gitea = Gitea("https://test-gitea.something", open(".token", "r").read(41))
 print("Gitea Version: " + gitea.get_version())
 print("API-Token belongs to user: " + gitea.get_user().username)
 
diff --git a/gitea/Gitea.py b/gitea/Gitea.py
index 773ebe4..19c1c89 100644
--- a/gitea/Gitea.py
+++ b/gitea/Gitea.py
@@ -129,7 +129,7 @@ class Gitea():
     ADMIN_REPO_CREATE = """/admin/users/%s/repos""" # <ownername>
     GITEA_VERSION = """/version"""
     GET_USER = """/user"""
-    CREATE_ORG = """/admin/users/%s/orgs""" #<username>
+    CREATE_ORG = """/admin/users/%s/orgs""" #username
 
     """
     @:param url: url of Gitea server without  .../api/<version>
@@ -261,15 +261,16 @@ class Gitea():
 
     # # #
 
-    def get_user(self, ):
+    def get_user(self) -> User:
         result = self.requests_get(Gitea.GET_USER)
         return User(self, "UNINIT", initJson=result)
 
-    def get_version(self):
+    def get_version(self) -> str:
         result = self.requests_get(Gitea.GITEA_VERSION)
         return result["version"]
 
-    def create_user(self, userName: str, email: str, fullName: str, password: str, sendNotify = True, sourceId = 0):
+    def create_user(self, userName: str, email: str, fullName: str, password: str, sendNotify = True, sourceId = 0)\
+            -> User:
         result = self.requests_post(Gitea.ADMIN_CREATE_USER,
             data={'source_id': sourceId, 'login_name': userName, 'username': userName, 'full_name': fullName,
             'email': email, 'password': password, 'send_notify': sendNotify})
@@ -280,8 +281,10 @@ class Gitea():
             raise Exception("User not created... (gitea: %s)"%result["message"])
         return User(self, userName, result)
 
-    def create_repo(self, repoOwner, repoName: str, description: str, private: bool, autoInit = True, gitignores = None, license= None, readme = "Default"):
-        assert(isinstance(repoOwner, User) or isinstance(repoOwner, Organization)) # although this only says user in the api, this also works for organizations
+    def create_repo(self, repoOwner, repoName: str, description: str,
+                    private: bool, autoInit = True, gitignores = None, license= None, readme = "Default") -> Repository:
+        # although this only says user in the api, this also works for organizations
+        assert(isinstance(repoOwner, User) or isinstance(repoOwner, Organization))
         result = self.requests_post(Gitea.ADMIN_REPO_CREATE%repoOwner.username,
             data={'name': repoName, 'description': description, 'private': private,
                                               'auto_init': autoInit, 'gitignores': gitignores, 'license': license, 'readme': readme})
@@ -292,11 +295,10 @@ class Gitea():
             raise Exception("Repository not created... (gitea: %s)"%(result["message"]))
         return Repository(self, repoOwner, repoName, result)
 
-    def create_org(self, owner: User, orgName: str, description: str, website = "", location = ""):
+    def create_org(self, owner: User, orgName: str, description: str,  location = "") -> Organization:
         assert (isinstance(owner, User))
         result = self.requests_post(Gitea.CREATE_ORG%owner.username,
-                data={'username': orgName, 'full_name': orgName, 'description': description,
-                                          'website': website, 'location': location})
+                data={'username': orgName, "description" : description, "location" : location})
         if "id" in result:
             logging.info("Successfully created Repository %s "%(result["name"]))
         else: