From c1a2d74f7c1d11b7f188b01644ea49f4739def21 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Fri, 6 May 2011 22:36:33 -0400
Subject: [PATCH] libsaria: Move version information to new file

A bit of separation is good here, and it should help with managing the
code.
---
 libsaria/__init__.py         | 13 +------------
 libsaria/path/export.py      |  5 +++--
 libsaria/path/files.py       |  3 ++-
 libsaria/storage/__init__.py |  4 ++--
 libsaria/version.py          | 13 +++++++++++++
 libsaria/web.py              |  4 ++--
 ocarina/__init__.py          |  2 +-
 7 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 libsaria/version.py

diff --git a/libsaria/__init__.py b/libsaria/__init__.py
index f316bda5..ce3ad781 100644
--- a/libsaria/__init__.py
+++ b/libsaria/__init__.py
@@ -1,17 +1,6 @@
 # Bryan Schumaker (8/7/2010)
 
-__major__ = 4
-__minor__ = 5
-__bug__   = 1
-__dev__   = False
-
-__vstr__  = "%s.%s" % (__major__, __minor__)
-if __bug__ > 0:
-	__vstr__ = "%s.%s" % (__vstr__, __bug__)
-if __dev__ == True:
-	__vstr__ += "-dev"
-__vers__ = "Libsaria %s" % __vstr__
-
+import version
 import prefs
 import audio
 
diff --git a/libsaria/path/export.py b/libsaria/path/export.py
index fcc0b770..cec2f02f 100644
--- a/libsaria/path/export.py
+++ b/libsaria/path/export.py
@@ -4,6 +4,7 @@ import libsaria
 from libsaria import path
 from libsaria.sources import library
 from libsaria.sources import playlist
+from libsaria import version
 from libsaria import callbacks
 import libsaria.xm as xml
 
@@ -13,8 +14,8 @@ get_attrs = library.get_attrs
 set_attr  = library.set_attr
 file_id   = path.file_id
 lib_file  = "library"
-vers      = "%s.%s" % (libsaria.__major__, libsaria.__minor__)
-if libsaria.__dev__ == True:
+vers      = "%s.%s" % (version.__major__, version.__minor__)
+if version.__dev__ == True:
 	lib_file = lib_file + "-dev"
 lib_file += ".xml"
 lib_file  = path.join(path.saria_dir(), lib_file)
diff --git a/libsaria/path/files.py b/libsaria/path/files.py
index 4f6749fb..41edbff1 100644
--- a/libsaria/path/files.py
+++ b/libsaria/path/files.py
@@ -2,11 +2,12 @@
 
 import libsaria
 from libsaria import path
+from libsaria import version
 plugin = None
 export = None
 
 dev = ""
-if libsaria.__dev__ == True:
+if version.__dev__ == True:
 	dev = "-dev"
 
 def open_plugin(file):
diff --git a/libsaria/storage/__init__.py b/libsaria/storage/__init__.py
index b4d84167..c8df8fdc 100644
--- a/libsaria/storage/__init__.py
+++ b/libsaria/storage/__init__.py
@@ -3,13 +3,13 @@
 import os
 from os import path
 import cPickle as pickle
-import libsaria
+from libsaria import version
 
 USER_DIR  = path.expanduser("~")
 PROTO     = pickle.HIGHEST_PROTOCOL
 
 saria = ".saria"
-if libsaria.__dev__ == True:
+if version.__dev__ == True:
 	saria = ".saria-dev"
 SARIA_DIR = path.join(USER_DIR, saria)
 if path.exists(SARIA_DIR) == False:
diff --git a/libsaria/version.py b/libsaria/version.py
new file mode 100644
index 00000000..b1d66479
--- /dev/null
+++ b/libsaria/version.py
@@ -0,0 +1,13 @@
+# Bryan Schumaker (5 / 6 / 2011)
+
+__major__ = 4
+__minor__ = 6
+__bug__   = 0
+__dev__   = True
+
+__vstr__  = "%s.%s" % (__major__, __minor__)
+if __bug__ > 0:
+	__vstr__ = "%s.%s" % (__vstr__, __bug__)
+if __dev__ == True:
+	__vstr__ += "-dev"
+__vers__ = "Libsaria %s" % __vstr__
diff --git a/libsaria/web.py b/libsaria/web.py
index f0ec1714..e3bd9d36 100644
--- a/libsaria/web.py
+++ b/libsaria/web.py
@@ -1,10 +1,10 @@
 # Bryan Schumaker (10/24/2010)
 
-import libsaria
+from libsaria import version
 import urllib2
 import string
 
-HEADER = libsaria.__vers__
+HEADER = version.__vers__
 
 #vals = [ ('%','25'), (' ','20'), ('&','26'), ('<','3C'),  ('>','3E'),
 #	 ('"','22'), ('#','23'), ('$','24'), ('+', '2B'), ('\'','27'), #('+','2B'),
diff --git a/ocarina/__init__.py b/ocarina/__init__.py
index b57f693d..bbdeb170 100644
--- a/ocarina/__init__.py
+++ b/ocarina/__init__.py
@@ -9,7 +9,7 @@ import gobject
 gobject.threads_init()
 
 import libsaria
-__vers__  = "Ocarina %s" % libsaria.__vstr__
+__vers__  = "Ocarina %s" % libsaria.version.__vstr__
 
 def uptime():
 	return now() - __start__