python3 support

hako · Mar 3, 2018 · 40ee136 · 40ee136
1 parent 061f638
commit 40ee136
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Wesley Hill
+Copyright (c) 2018 Wesley Hill
 Copyright (c) 2013 Dan Claudiu Pop
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/README.rst b/README.rst
@@ -10,6 +10,10 @@ instalation and usage:
 
 ``pip install bbcli``
 
+or
+
+``pip3 install bbcli``
+
 and then in terminal:
 
 ``bbcli``

diff --git a/bbcli/bbcapi.py b/bbcli/bbcapi.py
@@ -6,7 +6,7 @@
 
 from defusedxml import minidom
 
-API_BASE_URL = "http://trevor-producer-cdn.api.bbci.co.uk"
+API_BASE_URL = "https://trevor-producer-cdn.api.bbci.co.uk"
 BBC_URL = "https://www.bbc.co.uk"
 BBC_POLLING_URL = "https://polling.bbc.co.uk"
 

diff --git a/bbcli/core.py b/bbcli/core.py
@@ -172,7 +172,7 @@ def make_screen(self):
         self.loop.screen.set_terminal_properties(colors=256)
         self.update_ticker()
         self.loop.set_alarm_in(200, self._wrapped_refresh)
-        self.loop.set_alarm_in(5, self.next)
+        self.loop.set_alarm_in(5, self.next_item)
 
     def set_keys(self):
         global _config
@@ -303,7 +303,7 @@ def get_tickers(self):
     def set_latest_links(self, link):
         self.link = link
 
-    def next(self, loop, *args):
+    def next_item(self, loop, *args):
         text = self.tickers
         if(not text):
             self.link = ''
@@ -327,7 +327,7 @@ def next(self, loop, *args):
             else:
                 self.set_status_bar("[" + text[self.ticker_count].prompt +"] " + text[self.ticker_count].headline.encode('ascii', 'ignore'))
                 self.set_latest_links(text[self.ticker_count].url)
-        self.loop.set_alarm_in(10, self.next)
+        self.loop.set_alarm_in(10, self.next_item)
 
     def _wrapped_refresh(self, loop, *args):
         online = self.isOnline()

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='bbcli',
-    version='0.2.3',
+    version='0.2.4',
     description='Browse BBC News like a hacker. (based on pyhackernews)',
     long_description=open('README.rst').read(),
     license=open('LICENSE').read(),
@@ -18,9 +18,11 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Operating System :: Unix',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Topic :: Terminals',
     ],
+    use_2to3=True,
     entry_points={
         'console_scripts': ['bbcli = bbcli.core:live']
     })