More text-file updates for 3.2.0-develop

INSTALL.txt

@@ -1,4 +1,4 @@
-                            SABnzbd 3.1.0
+                            SABnzbd 3.2.0
 
 -------------------------------------------------------------------------------
 0) LICENSE

ISSUES.txt

@@ -22,7 +22,7 @@
   setting the option "api_warnings" to 0.
   See: https://sabnzbd.org/wiki/configuration/3.1/special
 
-- On OSX you may encounter downloaded files with foreign characters.
+- On macOS you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
   The problem is caused by the PAR2 utility and we cannot fix this now.
   This does not apply to files inside RAR files.
@@ -33,25 +33,14 @@
   We cannot solve this problem, because the Operating System (read Windows)
   prevents the removal.
 
-- Memory usage can sometimes have high peaks. This makes using SABnzbd on very low
-  memory systems (e.g. a NAS device or a router) a challenge.
-  In particular on Synology (SynoCommunity) the device may report that SABnzbd is using
-  a lot of memory even when idle. In this case the memory is usually not actually used by
-  SABnzbd and will be available if required by other apps or the system. More information
-  can be found in the discussion here: https://github.com/SynoCommunity/spksrc/issues/2856
-
-- SABnzbd is not compatible with some software firewall versions.
-  The Microsoft Windows Firewall works fine, but remember to tell this
-  firewall that SABnzbd is allowed to talk to other computers.
-
 - When SABnzbd cannot send notification emails, check your virus scanner,
   firewall or security suite. It may be blocking outgoing email.
 
-- When you are using external drives or network shares on OSX or Linux
+- When you are using external drives or network shares on macOS or Linux
   make sure that the drives are mounted.
   The operating system will simply redirect your files to alternative locations.
   You may have trouble finding the files when mounting the drive later.
-  On OSX, SABnzbd will not create new folders in /Volumes.
+  On macOS, SABnzbd will not create new folders in /Volumes.
   The result will be a failed job that can be retried once the volume has been mounted.
 
 - If you use a mounted drive as "temporary download folder", it must be present when SABnzbd

PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 3.1.0RC1
+Version: 3.2.0-develop
-Summary: SABnzbd-3.1.0RC1
+Summary: SABnzbd-3.2.0-develop
 Home-page: https://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org

README.mkd

@@ -34,15 +34,6 @@ Release Notes - SABnzbd 3.1.0 Release Candidate 1
 - Windows: non-Latin languages were displayed incorrectly in the installer.
 - Windows: could fail to create folders on some network shares.
 
-## Upgrade notices
-- Jobs that failed on versions before 3.1.x, will throw an error about the 
-  attribute file failing to load when they are retried on 3.1.0+. This error 
-  can be ignored.
-- When upgrading from 2.x.x or older the queue will be converted. Job order,
-  settings and data will be preserved, but if you decide to go back to 2.x.x
-  your queue cannot be downgraded again. But you can restore the jobs by going
-  to the Status page and running Queue Repair.
-
 ## Known problems and solutions
 - Read the file "ISSUES.txt"
 

SABnzbd.py

@@ -614,7 +614,7 @@ def get_webhost(cherryhost, cherryport, https_port):
             if ips[0] != "127.0.0.1":
                 browserhost = "127.0.0.1"
 
-    # This is to please Chrome on OSX
+    # This is to please Chrome on macOS
     if cherryhost == "localhost" and sabnzbd.DARWIN:
         cherryhost = "127.0.0.1"
         browserhost = "localhost"
@@ -731,7 +731,7 @@ def commandline_handler():
     serv_opts = [os.path.normpath(os.path.abspath(sys.argv[0]))]
     upload_nzbs = []
 
-    # OSX binary: get rid of the weird -psn_0_123456 parameter
+    # macOS binary: get rid of the weird -psn_0_123456 parameter
     for arg in sys.argv:
         if arg.startswith("-psn_"):
             sys.argv.remove(arg)
@@ -1536,7 +1536,7 @@ def main():
             sys.argv = sabnzbd.RESTART_ARGS
 
             os.chdir(org_dir)
-            # If OSX frozen restart of app instead of embedded python
+            # If macOS frozen restart of app instead of embedded python
             if hasattr(sys, "frozen") and sabnzbd.DARWIN:
                 # [[NSProcessInfo processInfo] processIdentifier]]
                 # logging.info("%s" % (NSProcessInfo.processInfo().processIdentifier()))
@@ -1704,7 +1704,7 @@ if __name__ == "__main__":
 
     elif sabnzbd.DARWIN and sabnzbd.FOUNDATION:
 
-        # OSX binary runner
+        # macOS binary runner
         from threading import Thread
         from PyObjCTools import AppHelper
         from AppKit import NSApplication

requirements.txt

@@ -1,8 +1,7 @@
 sabyenc3>=4.0.0
 cheetah3>=3.0.0
 cryptography
-feedparser<6.0.0; python_version == '3.5'
+feedparser>=6.0.0
-feedparser>=6.0.0; python_version > '3.5'
 configobj
 cheroot<8.4.3
 cherrypy

sabnzbd/__init__.py

@@ -869,7 +869,7 @@ def empty_queues():
 
 
 def keep_awake():
-    """ If we still have work to do, keep Windows/OSX system awake """
+    """ If we still have work to do, keep Windows/macOS system awake """
     if KERNEL32 or FOUNDATION:
         if sabnzbd.cfg.keep_awake():
             ES_CONTINUOUS = 0x80000000

sabnzbd/filesystem.py

@@ -144,7 +144,7 @@ def sanitize_filename(name):
         legal += CH_LEGAL_WIN
 
     if ":" in name and sabnzbd.DARWIN:
-        # Compensate for the foolish way par2 on OSX handles a colon character
+        # Compensate for the foolish way par2 on macOS handles a colon character
         name = name[name.rfind(":") + 1 :]
 
     lst = []
@@ -388,7 +388,7 @@ def is_archive(path):
 
 
 def check_mount(path):
-    """Return False if volume isn't mounted on Linux or OSX
+    """Return False if volume isn't mounted on Linux or macOS
     Retry 6 times with an interval of 1 sec.
     """
     if sabnzbd.DARWIN:

sabnzbd/newsunpack.py

@@ -1917,7 +1917,7 @@ def MultiPar_Verify(parfile, nzo, setname, joinables, single=False):
 
 def create_env(nzo=None, extra_env_fields={}):
     """Modify the environment for pp-scripts with extra information
-    OSX: Return copy of environment without PYTHONPATH and PYTHONHOME
+    macOS: Return copy of environment without PYTHONPATH and PYTHONHOME
     other: return None
     """
     env = os.environ.copy()

sabnzbd/osxmenu.py

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 """
-sabnzbd.osxmenu - OSX Top Menu
+sabnzbd.osxmenu - macOS Top Menu
 """
 
 import objc
@@ -802,7 +802,7 @@ class SABnzbdDelegate(NSObject):
         # logging.info('[osx] file open')
         # logging.info('[osx] file : %s' % (filenames))
         for filename in filenames:
-            logging.info("[osx] receiving from OSX : %s", filename)
+            logging.info("[osx] receiving from macOS : %s", filename)
             if os.path.exists(filename):
                 if sabnzbd.filesystem.get_ext(filename) in VALID_ARCHIVES + VALID_NZB_FILES:
                     sabnzbd.add_nzbfile(filename, keep=True)

sabnzbd/powersup.py

@@ -75,12 +75,12 @@ def win_shutdown():
 
 
 ##############################################################################
-# Power management for OSX
+# Power management for macOS
 ##############################################################################
 
 
 def osx_shutdown():
-    """ Shutdown OSX system, never returns """
+    """ Shutdown macOS system, never returns """
     try:
         subprocess.call(["osascript", "-e", 'tell app "System Events" to shut down'])
     except:
@@ -90,7 +90,7 @@ def osx_shutdown():
 
 
 def osx_standby():
-    """ Make OSX system sleep, returns after wakeup """
+    """ Make macOS system sleep, returns after wakeup """
     try:
         subprocess.call(["osascript", "-e", 'tell app "System Events" to sleep'])
         time.sleep(10)
@@ -100,7 +100,7 @@ def osx_standby():
 
 
 def osx_hibernate():
-    """ Make OSX system sleep, returns after wakeup """
+    """ Make macOS system sleep, returns after wakeup """
     osx_standby()
 
 

sabnzbd/skintext.py

@@ -696,7 +696,7 @@ SKIN_TEXT = {
     "opt-ncenter_enable": TT("Notification Center"),
     "opt-acenter_enable": TT("Enable Windows Notifications"),
     "testNotify": TT("Test Notification"),
-    "section-NC": TT("Notification Center"),  #: Header for OSX Notfication Center section
+    "section-NC": TT("Notification Center"),  #: Header for macOS Notfication Center section
     "section-AC": TT("Windows Notifications"),
     "section-OSD": TT("NotifyOSD"),  #: Header for Ubuntu's NotifyOSD notifications section
     "section-Prowl": TT("Prowl"),  #: Header for Prowl notification section

sabnzbd/sorting.py

@@ -1165,7 +1165,7 @@ def strip_folders(path):
         """ Strip all leading/trailing underscores also dots for Windows """
         x = x.strip().strip("_")
         if sabnzbd.WIN32:
-            # OSX and Linux should keep dots, because leading dots are significant
+            # macOS and Linux should keep dots, because leading dots are significant
             # while Windows cannot handle trailing dots
             x = x.strip(".")
         x = x.strip()

sabnzbd/utils/sleepless.py

@@ -17,7 +17,7 @@
 
 
 """
-sabnzbd.utils.sleepless - Keep macOS (OSX) awake by setting power assertions
+sabnzbd.utils.sleepless - Keep macOS awake by setting power assertions
 """