[Jppy-commit] [SCM] jppy - Python bindings and API for jpilot databases and a GTK2 GUI branch, devel-plugin-arch, updated. releases/0.0.48-44-g7707312

[Nick Piper]

The following commit has been merged in the devel-plugin-arch branch:
commit ed08224aeb5e4b8d12dc0757887e7fc34ca6c470
Author: Nick Piper <nick-git@nickpiper.co.uk>
Date:   Sun Nov 16 17:13:57 2008 +0000

    Rename baseclasses to api

diff --git a/jppy/__init__.py b/jppy/__init__.py
index 138e6f5..d627a27 100644
--- a/jppy/__init__.py
+++ b/jppy/__init__.py
@@ -1,5 +1,5 @@
 import environment
-from conduit import IConduit
+import api
 
 # import all components/plugins - we should search using
 # distutils for these maybe
diff --git a/jppy/baseclasses.py b/jppy/api.py
similarity index 97%
rename from jppy/baseclasses.py
rename to jppy/api.py
index 3819584..93d8bb1 100644
--- a/jppy/baseclasses.py
+++ b/jppy/api.py
@@ -248,3 +248,17 @@ class calendar(databaseAccessor):
 class installFile(Component):
     def install(self, filename):
         pass
+
+class IConduit(Interface):
+    def pre_sync_pre_connect(self):
+        pass
+    
+    def pre_sync(self):
+        pass
+
+    def sync(self, sd):
+        pass
+
+    def post_sync(self):
+        pass
+
diff --git a/jppy/conduit.py b/jppy/conduit.py
deleted file mode 100644
index 52ffcfe..0000000
--- a/jppy/conduit.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from core import Interface
-class IConduit(Interface):
-    def pre_sync_pre_connect(self):
-        pass
-    
-    def pre_sync(self):
-        pass
-
-    def sync(self, sd):
-        pass
-
-    def post_sync(self):
-        pass
-    
diff --git a/jppy/datebk6.py b/jppy/datebk6.py
index b1b4e61..98b8277 100644
--- a/jppy/datebk6.py
+++ b/jppy/datebk6.py
@@ -1,5 +1,5 @@
 from core import Component, implements
-from baseclasses import ITodoExtension
+from api import ITodoExtension
 
 class TodoProcessor(Component):
     _keys = ["advance","alarm_library","color",
diff --git a/jppy/environment.py b/jppy/environment.py
index 7e166b2..e7d0fea 100644
--- a/jppy/environment.py
+++ b/jppy/environment.py
@@ -1,6 +1,6 @@
 from jppy.core import Component, ComponentManager, ExtensionPoint
 from jppy.config import *
-from jppy.baseclasses import IAddressBook, ITaskList, IMemoList, ICalendar, IInstallFile
+from jppy.api import IAddressBook, ITaskList, IMemoList, ICalendar, IInstallFile
 import os
 
 # a new Environment class will handle reading and keeping the config
diff --git a/jppy/jpilot/legacy.py b/jppy/jpilot/legacy.py
index 5fc138e..0585f94 100644
--- a/jppy/jpilot/legacy.py
+++ b/jppy/jpilot/legacy.py
@@ -3,8 +3,8 @@ import os
 from jppy import _jpilot
 from jppy.core import implements
 
-from jppy.baseclasses import addressBook, memoList, memo32List, taskList, calendar, installFile
-from jppy.baseclasses import IAddressBook, IMemoList, ITaskList, ICalendar, IInstallFile
+from jppy.api import addressBook, memoList, memo32List, taskList, calendar, installFile
+from jppy.api import IAddressBook, IMemoList, ITaskList, ICalendar, IInstallFile
 
 assert _jpilot.check_hidden_dir() == 0
 assert _jpilot.check_copy_DBs_to_home() == 0   
diff --git a/jppy/jpilot/modern.py b/jppy/jpilot/modern.py
index c8785d9..d19855f 100644
--- a/jppy/jpilot/modern.py
+++ b/jppy/jpilot/modern.py
@@ -1,6 +1,6 @@
 import os
 
-from jppy import _jpilot, baseclasses
+from jppy import _jpilot, api
 import legacy
 
 class addressBook(legacy.addressBook, legacy.jpilot_common_mixin):

-- 
jppy - Python bindings and API for jpilot databases and a GTK2 GUI