Movind Downloader and WikimediaAPI classes into __init__.py file

+ Adding .gitignore

3 files changed, 29 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b8079b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+__pycache__
+*~
+*.swp
diff --git a/src/downloader/wikimedia.py b/src/downloader/__init__.py
index 1905d0a..cfcf20a 100644
--- a/src/downloader/wikimedia.py
+++ b/src/downloader/__init__.py
@@ -1,7 +1,32 @@
 """
-Module used to generate wikimedia API urls for several uses
+Init file of the downloader module.
+
+The downloader module is used to take care of the downloading part of the
+program, including manipulation of the wikimedia API.
 """
 
+import urllib.request
+# For system proxy
+import os
+
+
+class Downloader():
+    """Class used to download a given webpage considering system proxy"""
+    def __init__(self):
+        self.proxy_address = os.environ.get("HTTP_Proxy")
+        self.proxy = urllib.request.ProxyHandler({'http': self.proxy_address})
+        self.opener = urllib.request.build_opener(self.proxy)
+        urllib.request.install_opener(self.opener)
+
+    def download(self, url):
+        """ Download the given URL and return the source code """
+        return urllib.request.urlopen(url).read().decode("utf8")
+
+    def download_in_file(self, url, output_file_path):
+        """ Download the given URL and write to the given file """
+        with open(output_file_path, "w") as output_file:
+            output_file.write(self.download(url))
+
 
 class WikimediaAPI():
     """
diff --git a/src/downloader/downloader.py b/src/downloader/downloader.py
deleted file mode 100644
index 740caf8..0000000
--- a/src/downloader/downloader.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Module used to download a given webpage with several options related to the
-wikimedia API
-"""
-
-import urllib.request
-# For system proxy
-import os
-
-
-class Downloader():
-    """Class used to download a given webpage considering system proxy"""
-    def __init__(self):
-        self.proxy_address = os.environ.get("HTTP_Proxy")
-        self.proxy = urllib.request.ProxyHandler({'http': self.proxy_address})
-        self.opener = urllib.request.build_opener(self.proxy)
-        urllib.request.install_opener(self.opener)
-
-    def download(self, url):
-        """ Download the given URL and return the source code """
-        return urllib.request.urlopen(url).read().decode("utf8")
-
-    def download_in_file(self, url, output_file_path):
-        """ Download the given URL and write to the given file """
-        with open(output_file_path, "w") as output_file:
-            output_file.write(self.download(url))