Refactor random_proxies package

Author: 2knal

proxies/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
+from proxies.random_proxies import random_proxy

proxies/random_proxies/db.py

@@ -6,6 +6,7 @@
 from proxies.cache_server.config import es
 from proxies.cache_server.config import MAX_SIZE
 from proxies.random_proxies.log import logger
+from proxies.random_proxies.exception NoSuchProxyError
 
 def pop(conditions):
     search_query = {
@@ -17,10 +18,12 @@ def pop(conditions):
         data = es.search(index='proxies', doc_type='proxy', body=search_query)
         proxies = data['hits']['hits']
 
+        if len(proxies) == 0:
+            raise NoSuchProxyError('No proxy satisfying given conditions.')
         # Randomly select it
         proxy = choice(proxies)
         ip = proxy['_id']
-        print('Selected proxy:', proxy)
+        # print('Selected proxy:', proxy)
         # Remove it from proxies index
         es.delete(index='proxies', doc_type='proxy', id=ip)
 

proxies/random_proxies/proxy.py

@@ -12,7 +12,7 @@ def _select(proxies):
     if len(proxies) == 0:
         raise NoSuchProxyError('No proxy satisfying given conditions.')
     proxy = choice(proxies)
-    print('Selected proxy:', proxy, '\nLength:', len(proxies))
+    # print('Selected proxy:', proxy, '\nLength:', len(proxies))
     return proxy['ip address'] + ':' + proxy['port']
 
 def random_proxy(
@@ -52,6 +52,6 @@ def random_proxy(
                 ]
             }   
         }
-        print('Query:', query)
+        # print('Query:', query)
         # Fetch from db
         return pop(query)