Move flac.so and taglib.so to flac_archive package.

diff --git a/flac.c b/flac.c
index 98378e4..f539d11 100644 (file)
--- a/flac.c
+++ b/flac.c
@@ -148,7 +148,7 @@ initflac(void)
         return;
     }
 
         return;
     }
 

-    flac_error = PyErr_NewException("org.diplodocus.flac.error", NULL, NULL);
+    flac_error = PyErr_NewException("flac_archive.flac.error", NULL, NULL);

     if (flac_error == NULL) {
         return;
     }
     if (flac_error == NULL) {
         return;
     }

diff --git a/flac2mp3 b/flac2mp3
index 89aedb6..f862062 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -55,9 +55,9 @@ from optparse import OptionParser
 from subprocess import Popen, PIPE
 
 import org.diplodocus.jobs
 from subprocess import Popen, PIPE
 
 import org.diplodocus.jobs

-from org.diplodocus import flac, taglib

 from org.diplodocus.util import run_or_die
 
 from org.diplodocus.util import run_or_die
 

+from flac_archive import flac, taglib

 from flac_archive.tags import Tags
 
 ################################################################################
 from flac_archive.tags import Tags
 
 ################################################################################

diff --git a/setup.py b/setup.py
index 17c0f47..f4b2d29 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,10 @@ setup(name='flac-archive', version='6',
     ],
 
       ext_modules=[
     ],
 
       ext_modules=[

-    Extension(name='org.diplodocus.flac', sources=['flac.c'],
+    Extension(name='flac_archive.flac', sources=['flac.c'],

               extra_link_args=['-lFLAC'],
               ),
               extra_link_args=['-lFLAC'],
               ),

-    Extension(name='org.diplodocus.taglib', sources=['taglib.cc'],
+    Extension(name='flac_archive.taglib', sources=['taglib.cc'],

               extra_compile_args=taglib_cflags,
               extra_link_args=taglib_libs
               ),
               extra_compile_args=taglib_cflags,
               extra_link_args=taglib_libs
               ),

diff --git a/taglib.cc b/taglib.cc
index 690df40..1f04d16 100644 (file)
--- a/taglib.cc
+++ b/taglib.cc
@@ -118,7 +118,7 @@ inittaglib(void)
         return;
     }
 
         return;
     }
 

-    taglib_error = PyErr_NewException("org.diplodocus.taglib.error", 0, 0);
+    taglib_error = PyErr_NewException("flac_archive.taglib.error", 0, 0);

     if (taglib_error == 0) {
         return;
     }
     if (taglib_error == 0) {
         return;
     }