[orca] Rename platform to orca_platform.



commit aa6f89ff59376beee110ab82972bd096ad1c6e6b
Author: Alejandro Leiva <aleiva src gnome org>
Date:   Fri Aug 6 19:07:02 2010 +0200

    Rename platform to orca_platform.

 configure.in                                     |    2 +-
 src/orca/.cvsignore                              |    2 +-
 src/orca/.gitignore                              |    2 +-
 src/orca/Makefile.am                             |    2 +-
 src/orca/app_gui_prefs.py                        |   20 ++++++++++----------
 src/orca/braille.py                              |    4 ++--
 src/orca/httpserver.py                           |    4 ++--
 src/orca/orca.py                                 |    6 +++---
 src/orca/orca_gui_find.py                        |    8 ++++----
 src/orca/orca_gui_main.py                        |   10 +++++-----
 src/orca/orca_gui_prefs.py                       |   22 +++++++++++-----------
 src/orca/{platform.py.in => orca_platform.py.in} |    0
 src/orca/orca_quit.py                            |    8 ++++----
 13 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/configure.in b/configure.in
index 263b7fc..bf5e56b 100644
--- a/configure.in
+++ b/configure.in
@@ -116,7 +116,7 @@ src/orca/scripts/toolkits/J2SE-access-bridge/Makefile
 src/orca/scripts/toolkits/CALLY/Makefile
 src/orca/orca
 src/orca/orca_i18n.py
-src/orca/platform.py
+src/orca/orca_platform.py
 ],[chmod +x run_pylint.sh])
 
 if test "x$brlapi_available" = "xno" ; then
diff --git a/src/orca/.cvsignore b/src/orca/.cvsignore
index c18cf7f..37356df 100644
--- a/src/orca/.cvsignore
+++ b/src/orca/.cvsignore
@@ -3,5 +3,5 @@ Makefile.in
 orca
 orca-setup
 orca_i18n.py
-platform.py
+orca_platform.py
 *.pyc
diff --git a/src/orca/.gitignore b/src/orca/.gitignore
index 72e568b..b792267 100644
--- a/src/orca/.gitignore
+++ b/src/orca/.gitignore
@@ -3,6 +3,6 @@ Makefile.in
 orca
 orca-setup
 orca_i18n.py
-platform.py
+orca_platform.py
 *.pyc
 *~
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index 697cd00..80d2e07 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -54,7 +54,7 @@ orca_python_PYTHON = \
 	outline.py \
 	outloud.py \
 	phonnames.py \
-	platform.py \
+	orca_platform.py \
 	presentation_manager.py \
 	pronunciation_dict.py \
 	punctuation_settings.py \
diff --git a/src/orca/app_gui_prefs.py b/src/orca/app_gui_prefs.py
index 5fa1c4a..a69bb0a 100644
--- a/src/orca/app_gui_prefs.py
+++ b/src/orca/app_gui_prefs.py
@@ -41,7 +41,7 @@ import orca_gtkbuilder
 import orca_gui_prefs
 import orca_prefs
 import orca_state
-import platform
+import orca_platform
 import settings
 import speech
 
@@ -329,15 +329,15 @@ def showPreferencesUI():
 
         prefsDict = orca_prefs.readPreferences()
         orca_state.prefsUIFile = \
-            os.path.join(platform.prefix,
-                         platform.datadirname,
-                         platform.package,
+            os.path.join(orca_platform.prefix,
+                         orca_platform.datadirname,
+                         orca_platform.package,
                          "ui",
                          "orca-setup.ui")
         orca_state.advancedMagUIFile = \
-            os.path.join(platform.prefix,
-                         platform.datadirname,
-                         platform.package,
+            os.path.join(orca_platform.prefix,
+                         orca_platform.datadirname,
+                         orca_platform.package,
                          "ui",
                          "orca-advanced-magnification.ui")
         orca_state.advancedMag = \
@@ -354,9 +354,9 @@ def showPreferencesUI():
     else:
         if not orca_state.orcaWD:
             orca_state.orcaWarningDialogUIFile = \
-                os.path.join(platform.prefix,
-                             platform.datadirname,
-                             platform.package,
+                os.path.join(orca_platform.prefix,
+                             orca_platform.datadirname,
+                             orca_platform.package,
                              "ui",
                              "orca-preferences-warning.ui")
             orca_state.orcaWD = \
diff --git a/src/orca/braille.py b/src/orca/braille.py
index 56a5763..7300727 100644
--- a/src/orca/braille.py
+++ b/src/orca/braille.py
@@ -72,14 +72,14 @@ import settings
 
 # Right now, the orca autogen.sh/configure needs a priori knowledge of
 # where the liblouis tables are.  When running autogen.sh/configure,
-# platform.py:tablesdir will be set to point to the liblouis table
+# orca_platform.py:tablesdir will be set to point to the liblouis table
 # location.  If not found, it will be the empty string.  We need to
 # capture that error condition, otherwise braille contraction will
 # just plain fail.  See also bgo#610134.  [[TODO: WDW - see if the
 # liblouis bindings can give us the tablesdir information at runtime
 # http://code.google.com/p/liblouis/issues/detail?id=9]]
 #
-from platform import tablesdir
+from orca_platform import tablesdir
 if louis and not tablesdir:
     debug.println(debug.LEVEL_SEVERE,
                   "Contraction tables for liblouis cannot be found.")
diff --git a/src/orca/httpserver.py b/src/orca/httpserver.py
index 18e82fa..aff58a5 100644
--- a/src/orca/httpserver.py
+++ b/src/orca/httpserver.py
@@ -31,7 +31,7 @@ import threading
 import BaseHTTPServer
 
 import debug
-import platform
+import orca_platform
 import settings
 import speech
 
@@ -67,7 +67,7 @@ class _HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         self.send_header("Content-type", "text/html")
         self.end_headers()
         self.wfile.write("<html><body><p>Orca %s</p></body></html>" \
-                         % platform.version)
+                         % orca_platform.version)
 
     def do_POST(self):
         contentLength = self.headers.getheader('content-length')
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 038fc79..6a86300 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -82,7 +82,7 @@ import httpserver
 import keynames
 import keybindings
 import orca_state
-import platform
+import orca_platform
 import speech
 
 from input_event import BrailleEvent
@@ -1765,7 +1765,7 @@ def usage():
     #
     print "-?, --help                   " + _("Show this help message")
 
-    print "-v, --version                %s" % platform.version
+    print "-v, --version                %s" % orca_platform.version
 
     # Translators: this is a testing option for the command line.  It prints
     # the names of the applications known to the accessibility infrastructure
@@ -2044,7 +2044,7 @@ def main():
                 usage()
                 die(0)
             if opt in ("-v", "--version"):
-                print "Orca %s" % platform.version
+                print "Orca %s" % orca_platform.version
                 die(0)
             if opt == "--debug":
                 _debugSwitch = True
diff --git a/src/orca/orca_gui_find.py b/src/orca/orca_gui_find.py
index 0a724e2..da8f4bc 100644
--- a/src/orca/orca_gui_find.py
+++ b/src/orca/orca_gui_find.py
@@ -34,7 +34,7 @@ import locale
 import find
 import orca_gtkbuilder
 import orca_state
-import platform
+import orca_platform
 
 from orca_i18n import _  # for gettext support
 
@@ -246,9 +246,9 @@ def showFindUI():
     global OS
 
     if not OS:
-        uiFile = os.path.join(platform.prefix,
-                              platform.datadirname,
-                              platform.package,
+        uiFile = os.path.join(orca_platform.prefix,
+                              orca_platform.datadirname,
+                              orca_platform.package,
                               "ui",
                               "orca-find.ui")
         OS = OrcaFindGUI(uiFile, "findDialog")
diff --git a/src/orca/orca_gui_main.py b/src/orca/orca_gui_main.py
index 3692f05..26880fe 100644
--- a/src/orca/orca_gui_main.py
+++ b/src/orca/orca_gui_main.py
@@ -32,7 +32,7 @@ import locale
 
 import orca
 import orca_gtkbuilder
-import platform
+import orca_platform
 
 from orca_i18n import _           # for gettext support
 
@@ -139,7 +139,7 @@ class OrcaMainGUI(orca_gtkbuilder.GtkBuilderWrapper):
         self.aboutDialog.set_license(licenseText)
         self.aboutDialog.set_logo_icon_name('orca')
         self.aboutDialog.set_name(_('Orca'))
-        self.aboutDialog.set_version(platform.version)
+        self.aboutDialog.set_version(orca_platform.version)
         self.aboutDialog.set_website(url)
         self.aboutDialog.connect('response', self.aboutDialogOnResponse)
         self.aboutDialog.show()
@@ -201,9 +201,9 @@ def showMainUI():
     global OS
 
     if not OS:
-        uiFile = os.path.join(platform.prefix,
-                              platform.datadirname,
-                              platform.package,
+        uiFile = os.path.join(orca_platform.prefix,
+                              orca_platform.datadirname,
+                              orca_platform.package,
                               "ui",
                               "orca-mainwin.ui")
         OS = OrcaMainGUI(uiFile, "mainWindow")
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index 2256dc0..d67aebb 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -43,7 +43,7 @@ import orca
 import orca_gtkbuilder
 import orca_prefs
 import orca_state
-import platform
+import orca_platform
 import settings
 import default    # for the default keyBindings
 import input_event
@@ -58,7 +58,7 @@ try:
     import louis
 except ImportError:
     louis = None
-from platform import tablesdir
+from orca_platform import tablesdir
 if louis and not tablesdir:
     louis = None
 
@@ -5030,15 +5030,15 @@ def showPreferencesUI():
 
         prefsDict = orca_prefs.readPreferences()
         orca_state.prefsUIFile = \
-            os.path.join(platform.prefix,
-                         platform.datadirname,
-                         platform.package,
+            os.path.join(orca_platform.prefix,
+                         orca_platform.datadirname,
+                         orca_platform.package,
                          "ui",
                          "orca-setup.ui")
         orca_state.advancedMagUIFile = \
-            os.path.join(platform.prefix,
-                         platform.datadirname,
-                         platform.package,
+            os.path.join(orca_platform.prefix,
+                         orca_platform.datadirname,
+                         orca_platform.package,
                          "ui",
                          "orca-advanced-magnification.ui")
         orca_state.advancedMag = \
@@ -5054,9 +5054,9 @@ def showPreferencesUI():
     else:
         if not orca_state.orcaWD:
             orca_state.orcaWarningDialogUIFile = \
-                os.path.join(platform.prefix,
-                             platform.datadirname,
-                             platform.package,
+                os.path.join(orca_platform.prefix,
+                             orca_platform.datadirname,
+                             orca_platform.package,
                              "ui",
                              "orca-preferences-warning.ui")
             orca_state.orcaWD = \
diff --git a/src/orca/platform.py.in b/src/orca/orca_platform.py.in
similarity index 100%
rename from src/orca/platform.py.in
rename to src/orca/orca_platform.py.in
diff --git a/src/orca/orca_quit.py b/src/orca/orca_quit.py
index 92f420c..7cd64ba 100644
--- a/src/orca/orca_quit.py
+++ b/src/orca/orca_quit.py
@@ -34,7 +34,7 @@ import locale
 import orca
 import orca_gtkbuilder
 import orca_state
-import platform
+import orca_platform
 import settings
 
 OS = None
@@ -111,9 +111,9 @@ def showQuitUI():
     global OS
 
     if not OS:
-        uiFile = os.path.join(platform.prefix,
-                              platform.datadirname,
-                              platform.package,
+        uiFile = os.path.join(orca_platform.prefix,
+                              orca_platform.datadirname,
+                              orca_platform.package,
                               "ui",
                               "orca-quit.ui")
         OS = OrcaQuitGUI(uiFile, "quitDialog")



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]