From c7811ddd11c16f26ceb8ef6d675efcd3ba634600 Mon Sep 17 00:00:00 2001
From: RecursiveGreen <recursive.green@gmail.com>
Date: Mon, 10 Jun 2019 07:37:22 -0400
Subject: [PATCH] Code shuffle.

---
 savepointradio/core/utils.py      | 18 +++++++++++++++++-
 savepointradio/core/validators.py | 17 +----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/savepointradio/core/utils.py b/savepointradio/core/utils.py
index 0d904db..24d73eb 100644
--- a/savepointradio/core/utils.py
+++ b/savepointradio/core/utils.py
@@ -17,7 +17,23 @@ from django.db import connection
 from django.utils.encoding import iri_to_uri, uri_to_iri
 
 from .models import Setting
-from .validators import GROUP_NT_DRIVE_LETTER, GROUP_NT_UNC
+
+
+GROUP_NT_UNC = r'file://[A-Za-z0-9!@#$%^&\'\)\(\.\-_{}~]+/'
+
+GROUP_NT_DRIVE_LETTER = r'file:///[A-Za-z](?:\:|\|)/'
+
+GROUP_NON_AUTH = r'file:///[A-Za-z0-9!@#$%^&\'\)\(\.\-_{}~]+'
+
+FILE_IRI_PATTERN = (
+    r'^(?P<unc>' +
+    GROUP_NT_UNC +
+    r')|(?P<driveletter>' +
+    GROUP_NT_DRIVE_LETTER +
+    r')|(?P<nonauth>' +
+    GROUP_NON_AUTH +
+    r')'
+)
 
 
 def generate_password(length=32):
diff --git a/savepointradio/core/validators.py b/savepointradio/core/validators.py
index 6030762..bcdc7da 100644
--- a/savepointradio/core/validators.py
+++ b/savepointradio/core/validators.py
@@ -8,22 +8,7 @@ from django.core import validators
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
-
-GROUP_NT_UNC = r'file://[A-Za-z0-9!@#$%^&\'\)\(\.\-_{}~]+/'
-
-GROUP_NT_DRIVE_LETTER = r'file:///[A-Za-z](?:\:|\|)/'
-
-GROUP_NON_AUTH = r'file:///[A-Za-z0-9!@#$%^&\'\)\(\.\-_{}~]+'
-
-FILE_IRI_PATTERN = (
-    r'^(?P<unc>' +
-    GROUP_NT_UNC +
-    r')|(?P<driveletter>' +
-    GROUP_NT_DRIVE_LETTER +
-    r')|(?P<nonauth>' +
-    GROUP_NON_AUTH +
-    r')'
-)
+from .utils import FILE_IRI_PATTERN
 
 
 class RadioIRIValidator(validators.URLValidator):