python3 compability

Author: littleskunk

README.rst

@@ -39,7 +39,7 @@ Setup
 -----
 Install required packages
 ::
-  $ sudo apt-get install git sqlite3 mongodb gunicorn tmux python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev
+  $ sudo apt-get install git sqlite3 mongodb tmux python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev
   $ git clone https://github.com/Storj/driveshare-graph.git
   $ cd driveshare-graph
   $ pip install -r requirements.txt
@@ -58,7 +58,7 @@ Deploy
 Use gunicorn
 ::
   $ tmux attach -t driveshare-graph
-  $ cd driveshare-graph/driveshare-graph
+  $ cd driveshare-graph/driveshare_graph
   $ gunicorn -b 0.0.0.0:80 --workers=4 app:app
 Detach the tmux session after running gunicorn.
 

driveshare_graph/minmax.py

@@ -87,7 +87,7 @@ def minmax_chart(collection):
     dates = []
     min_counts = []
     max_counts = []
-    for key in minmax_dict.iterkeys():
+    for key in minmax_dict.keys():
         dates.append(key)
     dates.sort()
     for date in dates:

driveshare_graph/uptime.py

@@ -52,7 +52,7 @@ def init_farmers_table(conn, cursor, collection):
                 uptimes[btc_address] = 0
         previous_time = doc_time
 
-    for key, value in first_dates.iteritems():
+    for key, value in first_dates.items():
         address = key
         first_date = value
         last_date = last_dates[key]
@@ -239,7 +239,7 @@ def uptime_histogram(cursor, collection): # pragma: no cover
                                        xrange=(0, 100),
                                        disable_xml_declaration=True)
     distribution = uptime_distribution(cursor, collection)
-    for key, value in distribution.iteritems():
+    for key, value in distribution.items():
         bucket = '%i%% to %i%%' % (key, key+5)
         uptime_histogram.add(bucket, [(value, key, key+5)])
     return uptime_histogram

requirements.txt

@@ -2,4 +2,5 @@ flask==0.10.1
 pymongo==3.0.3
 pygal==2.0.7
 simplejson==3.8.1
-
+gunicorn>=19.4.5
+scrapy>=1.0.5