From b592868bcd3e10f7d1cd524c4c697bb459a5c044 Mon Sep 17 00:00:00 2001
From: borzechof99 <borzechof99@mi.fu-berlin.de>
Date: Sat, 26 Jun 2021 18:27:39 +0200
Subject: [PATCH] Move Course Scraper into quiz
---
unisportomat/{ => quiz}/course_scraper/course_scraper.py | 5 +++--
.../{ => quiz}/course_scraper/test_course_scraper.py | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
rename unisportomat/{ => quiz}/course_scraper/course_scraper.py (93%)
rename unisportomat/{ => quiz}/course_scraper/test_course_scraper.py (85%)
diff --git a/unisportomat/course_scraper/course_scraper.py b/unisportomat/quiz/course_scraper/course_scraper.py
similarity index 93%
rename from unisportomat/course_scraper/course_scraper.py
rename to unisportomat/quiz/course_scraper/course_scraper.py
index 4c4a710..855a951 100644
--- a/unisportomat/course_scraper/course_scraper.py
+++ b/unisportomat/quiz/course_scraper/course_scraper.py
@@ -5,6 +5,7 @@ for http://www.buchsys.de for SWP UniSport-O-Mat.
import requests
from bs4 import BeautifulSoup
+from collections import OrderedDict
def fetch_website(url):
@@ -27,14 +28,14 @@ def fetch_website(url):
raise
-def scraping(site=None) -> dict:
+def scraping(site=None) -> OrderedDict:
"""
Returns a dictionary of the form {name: link},
containing the scraped content of
https://www.buchsys.de/fu-berlin/angebote/aktueller_zeitraum/index.html,
unless another URL is given as an argument.
"""
- courses = {}
+ courses = OrderedDict()
if site is None:
site = "https://www.buchsys.de/fu-berlin/angebote/aktueller_zeitraum/"
diff --git a/unisportomat/course_scraper/test_course_scraper.py b/unisportomat/quiz/course_scraper/test_course_scraper.py
similarity index 85%
rename from unisportomat/course_scraper/test_course_scraper.py
rename to unisportomat/quiz/course_scraper/test_course_scraper.py
index 62909ec..b48a3f4 100644
--- a/unisportomat/course_scraper/test_course_scraper.py
+++ b/unisportomat/quiz/course_scraper/test_course_scraper.py
@@ -3,6 +3,7 @@ Testing module, yo. Just for the course_scraper.py.
"""
from django.test import TestCase
from course_scraper import scraping # , fetch_website
+from collections import OrderedDict
class ScraperTestCase(TestCase):
@@ -15,7 +16,7 @@ class ScraperTestCase(TestCase):
"""
Testing return type of scraping().
"""
- self.assertIsInstance(scraping(), dict)
+ self.assertIsInstance(scraping(), OrderedDict)
def test_dict_not_empty(self):
"""
--
GitLab