cleanup

fet2020/documents/api.py

@@ -1,19 +1,16 @@
-from django.conf import settings
+import logging
-
 import os
 import urllib.parse
 
+from contextlib import contextmanager
+from django.conf import settings
 from etherpad_lite import EtherpadLiteClient, EtherpadException
 
-from contextlib import contextmanager
-
-
-import logging
 
 logger = logging.getLogger(__name__)
-
 SERVER_URL = settings.ETHERPAD_CLIENT["exturl"]
 
+
 @contextmanager
 def ignore_ep_exception(msg="", *exceptions):
     try:
@@ -97,8 +94,9 @@ def setPadHTML(padID, html):
 
 
 def get_pad_link(padID):
-    if padID is None:
+    if not padID:
         return "#"
+
     with ep_client() as (epc, group):
         if not epc or not group:
             return "#"

fet2020/documents/apps.py

@@ -1,7 +1,5 @@
 from django.apps import AppConfig
 
-# from django.contrib.admin.apps import AdminConfig
-
 
 class DocumentsConfig(AppConfig):
     name = "documents"

fet2020/documents/etherpadlib.py

@@ -25,7 +25,6 @@ def __get_ep_sessionid(request):
         )
     except Exception as e:
         raise e
-        return None, None
 
     return result["sessionID"], expires
 

fet2020/posts/models.py

@@ -26,19 +26,7 @@ request_logger = logging.getLogger("django.request")
 
 def create_pad_for_post(slug, typ="agenda"):
     "Creates a Etherpad Pad and returns EtherpadKey"
-    print("creatingpadforpost")
+    return createPadifNotExists(slug + "-" + typ)
-    try:
-        etherpad_key = createPadifNotExists(slug + "-" + typ)
-    except URLError as error:
-        request_logger.info(
-            "%s konnte von dem Slug '%s' nicht erstellt werden. Error: %s",
-            typ,
-            slug,
-            error,
-        )
-        return None
-
-    return etherpad_key
 
 
 class Category(models.Model):
@@ -119,16 +107,7 @@ class Post(models.Model):
         if not self.agenda_key:
             return None
 
-        try:
+        return getPadHTML(self.agenda_key)
-            html = getPadHTML(self.agenda_key)
-        except URLError as error:
-            logger.error(
-                "Can't get the agenda html from agenda '%s'. Error: %s",
-                self.agenda_key,
-                error,
-            )
-            html = None
-        return html
 
     @property
     def protocol_html(self):
@@ -136,16 +115,7 @@ class Post(models.Model):
         if not self.protocol_key:
             return None
 
-        try:
+        return getPadHTML(self.protocol_key)
-            html = getPadHTML(self.protocol_key)
-        except URLError as error:
-            logger.error(
-                "Can't get the agenda html from agenda '%s'. Error: %s",
-                self.protocol_key,
-                error,
-            )
-            html = None
-        return html
 
     @agenda_html.setter
     def agenda_html(self, value):
@@ -154,15 +124,7 @@ class Post(models.Model):
         if not value or not self.agenda_key:
             return None
 
-        try:
         setPadHTML(self.agenda_key, value)
-        except URLError as error:
-            request_logger.error(
-                """Es konnte kein Pad von der Agenda '%s' erzeugt werden.
-                Error: %s""",
-                self.agenda_key,
-                error,
-            )
 
         request_logger.info(
             "set etherpad! for post %s id: %s", self.slug, self.agenda_key
@@ -176,15 +138,7 @@ class Post(models.Model):
         if not value or not self.protocol_key:
             return None
 
-        try:
         setPadHTML(self.protocol_key, value)
-        except URLError as error:
-            request_logger.error(
-                """Es konnte kein Pad von der Agenda '%s' erzeugt werden.
-                Error: %s""",
-                self.protocol_key,
-                error,
-            )
 
         request_logger.info(
             "set etherpad! for post %s id: %s", self.slug, self.protocol_key