Various updates

- Rebuild for python3.7
- Update python3 compatibility patch
- Update to new PyPI URLs

3 files changed, 29 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36834288bcd6..ed2f75e6bb39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 # Generated by mksrcinfo v8
-# Sat Jan  7 02:14:40 UTC 2017
+# Sat Jan  5 09:15:27 UTC 2019
 pkgbase = python-usersettings
 	pkgdesc = Python module for easily managing persistent settings using an editable format and stored in an OS-appropriate location.
 	pkgver = 1.0.7
-	pkgrel = 2
-	url = https://pypi.python.org/pypi/usersettings
+	pkgrel = 3
+	url = https://pypi.org/project/usersettings
 	arch = any
 	license = BSD
 	makedepends = python-setuptools
 	depends = python
 	depends = python-appdirs
-	source = https://pypi.python.org/packages/df/d3/b66294b2500f21fbeaa47e52bd5be90be3f2315e09bea2839ee0eeeb151b/usersettings-1.0.7.tar.gz
+	source = https://files.pythonhosted.org/packages/df/d3/b66294b2500f21fbeaa47e52bd5be90be3f2315e09bea2839ee0eeeb151b/usersettings-1.0.7.tar.gz
 	source = python3-compat.patch
 	sha256sums = c48c48f7bc1f00facc74da5ecfb6e1d95c66fc46d9e054c774958570f780d535
-	sha256sums = a4ad9ee39ce463a6c62d850e888b8fe229d9dd0922eee254d33698aa17c99494
+	sha256sums = 409b69dc535a380197635598ec86b14ee851b3cc8f41c6cc9d51297ce433cc08
 
 pkgname = python-usersettings
 
diff --git a/PKGBUILD b/PKGBUILD
index f640b7e8cec9..3ec541d89c56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 pkgname=python-usersettings
 pkgver=1.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Python module for easily managing persistent settings using an editable format and stored in an OS-appropriate location."
 arch=('any')
-url="https://pypi.python.org/pypi/usersettings"
+url="https://pypi.org/project/usersettings"
 license=("BSD")
 depends=("python" "python-appdirs")
 makedepends=("python-setuptools")
 source=(
-    "https://pypi.python.org/packages/df/d3/b66294b2500f21fbeaa47e52bd5be90be3f2315e09bea2839ee0eeeb151b/usersettings-1.0.7.tar.gz"
+    "https://files.pythonhosted.org/packages/df/d3/b66294b2500f21fbeaa47e52bd5be90be3f2315e09bea2839ee0eeeb151b/usersettings-1.0.7.tar.gz"
     "python3-compat.patch"
 )
 sha256sums=(
     "c48c48f7bc1f00facc74da5ecfb6e1d95c66fc46d9e054c774958570f780d535"
-    "a4ad9ee39ce463a6c62d850e888b8fe229d9dd0922eee254d33698aa17c99494"
+    "409b69dc535a380197635598ec86b14ee851b3cc8f41c6cc9d51297ce433cc08"
 )
 
 prepare() {
diff --git a/python3-compat.patch b/python3-compat.patch
index dac8e9be665f..ff5192d30362 100644
--- a/python3-compat.patch
+++ b/python3-compat.patch
@@ -1,51 +1,40 @@
-From c2bd739181bed34c8b6a916d5ee849568fd2301f Mon Sep 17 00:00:00 2001
-From: Matt Russell <mgrbyte@users.noreply.github.com>
-Date: Sun, 27 Sep 2015 14:55:58 +0100
-Subject: [PATCH] Python3 compat
+From 7a99d79e0be98dfca01d8a7780a83580c1f8c94f Mon Sep 17 00:00:00 2001
+From: Zach Deibert <zachdeibert@gmail.com>
+Date: Mon, 2 Jul 2018 10:26:15 -0500
+Subject: [PATCH] Added Python 3 support
 
 ---
- usersettings.py | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
+ usersettings.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/usersettings.py b/usersettings.py
-index bf46267..7b55c29 100644
+index bf46267..8331b67 100644
 --- a/usersettings.py
 +++ b/usersettings.py
-@@ -2,9 +2,15 @@
- """
+@@ -3,7 +3,10 @@
  Provide interface for persistent portable editable user settings
  """
--import os
+ import os
 -import ConfigParser
++try:
++	import ConfigParser
++except ImportError:
++	import configparser as ConfigParser
  import ast
-+import os
-+import sys
-+
-+PY3 = sys.version_info[0] == 3
-+if PY3:
-+    import configparser
-+else:
-+    import ConfigParser as configparser
  
  import appdirs
- 
-@@ -44,7 +50,7 @@ def load_settings(self):
-             super(Settings, self).__setitem__(key, value)
- 
-         # Load the stored values
--        parser = ConfigParser.RawConfigParser()
-+        parser = configparser.RawConfigParser()
-         try:
-             with open(self.settings_file, 'r') as settings_fp:
-                 parser.readfp(settings_fp)
-@@ -75,8 +81,8 @@ def load_settings(self):
+@@ -75,12 +78,12 @@ def load_settings(self):
      def save_settings(self):
          """ Write the settings data to disk """
          if not os.path.exists(self.settings_directory):
 -            os.makedirs(self.settings_directory, 0755)
--        parser = ConfigParser.RawConfigParser()
 +            os.makedirs(self.settings_directory, 0o755)
-+        parser = configparser.RawConfigParser()
+         parser = ConfigParser.RawConfigParser()
          parser.add_section('settings')
          for key, value in self.items():
              parser.set('settings', key, value)
+-        with open(self.settings_file, 'wb') as settings_fp:
++        with open(self.settings_file, 'w') as settings_fp:
+             parser.write(settings_fp)
+ 
+     def __getattr__(self, setting_name):