Changeset 71:c8e39db35e46 in stamper

Timestamp:

Sep 5, 2019, 4:38:38 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Make stamper python-3 compatible

Files:

• bin/stamp (modified) (1 diff)
• bin/stamps (modified) (1 diff)
• stamper/__init__.py (modified) (1 diff)
• stamper/config.py (modified) (1 diff)
• stamper/http.py (modified) (2 diffs)
• stamper/stamper.py (modified) (2 diffs)

bin/stamp

@@ -3 +3 @@
 import sys
 from datetime import datetime
-from stamper import Stamper
+from stamper.stamper import Stamper
 
 

bin/stamps

@@ -2 +2 @@
 
 from stamper.cli import build_args_parser
-from stamper import Stamper
+from stamper.stamper import Stamper
 
 

stamper/__init__.py

@@ -1 @@
-from stamper import Stamper
+

stamper/config.py

@@ -1 +1 @@
 
 import os
-from ConfigParser import SafeConfigParser
+from configparser import SafeConfigParser
 
 

stamper/http.py

@@ -1 +1 @@
 
-from urllib2 import (
-    Request, urlopen, build_opener, install_opener, HTTPCookieProcessor
-    )
-from urllib import urlencode
-from urlparse import urljoin
+import http.client
+from urllib.parse import urlparse, urlencode, quote_plus
 
 
@@ -10 +7 @@
 
     def __init__(self, base_url):
-        self.base_url = base_url
-        self.request = build_opener(HTTPCookieProcessor())
-        install_opener(self.request)
+        self.parsed_url = urlparse(base_url)
+        if self.parsed_url.scheme == 'https':
+            self.conn = http.client.HTTPSConnection(self.parsed_url.netloc)
+        else:
+            self.conn = http.client.HTTPConnection(self.parsed_url.netloc)
 
-    def send_request(self, url, data=None):
-        response = self.request.open(url, data)
+    def get(self, url):
+        self.conn.request('GET', url)
+        response = conn.getresponse()
         return response.read()
 
-    def get(self, url):
-        return self.send_request(urljoin(self.base_url, url))
-
     def post(self, url, data):
-        encoded_data = urlencode(data)
-        return self.send_request(urljoin(self.base_url, url), encoded_data)
+        encoded_data = urlencode(data, quote_via=quote_plus)
+        headers = {'Content-type': 'application/x-www-form-urlencoded',
+                   'Accept': 'text/plain'}
+        self.conn.request('POST', url, encoded_data, headers)
+        response = conn.getresponse()
+        return response.read()

stamper/stamper.py

@@ -292 +292 @@
                     # daily totals
                     print('daily total: %(total)s' % {'total': totals[day]})
-            print '-'*79
+            print('-'*79)
 
         # now calculate the totals and show them
@@ -318 +318 @@
             if totals:
                 print('------ Totals ------' % {'day': day})
-                for day, tot in totals.iteritems():
+                for day, tot in totals.items():
                     print(' %(day)s: %(total)s' % {'day': day, 'total': tot})
                     sum_tot = "%(total)s %(new)s" % {