[Pymoul-svn] SF.net SVN: pymoul: [275] pymoul/trunk

[<ti...@us...>]

Revision: 275
          http://pymoul.svn.sourceforge.net/pymoul/?rev=275&view=rev
Author:   tiran
Date:     2007-03-21 05:39:25 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
Removed usage of crypt functions and disabled UI for audio and graphics settings

Modified Paths:
--------------
    pymoul/trunk/Makefile.in
    pymoul/trunk/src/moul/crypt/elf.py
    pymoul/trunk/src/moul/crypt/whatdoyousee.py
    pymoul/trunk/src/moul/file/directory.py
    pymoul/trunk/src/moul/file/plasmalog.py
    pymoul/trunk/src/moul/file/tests/test_directory.py
    pymoul/trunk/src/moul/qt/mainwindow.py
    pymoul/trunk/src/moul/qt/ui/mainwindow.py
    pymoul/trunk/src/moul/qt/ui/mainwindow.ui

Modified: pymoul/trunk/Makefile.in
===================================================================
--- pymoul/trunk/Makefile.in	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/Makefile.in	2007-03-21 12:39:25 UTC (rev 275)
@@ -39,13 +39,13 @@
 	$(PYTHON) utilities/compileui.py ./src/moul/
 
 test_build: build 
-	PYTHONPATH="src" $(PYTHON) test.py $(TESTFLAGS) $(TESTOPTS)
+	MOUL_ALLOW_CRYPT="YES" PYTHONPATH="src" $(PYTHON) test.py $(TESTFLAGS) $(TESTOPTS)
 
 test_inplace: inplace 
-	PYTHONPATH="src" $(PYTHON) test.py $(TESTFLAGS) $(TESTOPTS)
+	MOUL_ALLOW_CRYPT="YES" PYTHONPATH="src" $(PYTHON) test.py $(TESTFLAGS) $(TESTOPTS)
 
 doc_html:
-	PYTHONPATH="src" $(EPYDOC) -v --html --no-sourcecode \
+	MOUL_ALLOW_CRYPT="YES" PYTHONPATH="src" $(EPYDOC) -v --html --no-sourcecode \
 	--output="doc/html" moul
 
 doc_html_graph:

Modified: pymoul/trunk/src/moul/crypt/elf.py
===================================================================
--- pymoul/trunk/src/moul/crypt/elf.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/crypt/elf.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -23,6 +23,10 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
+import os
+if not os.environ.get("MOUL_ALLOW_CRYPT"):
+    raise ImportError("The import of this module has been restricted")
+
 import struct
 
 # TODO: use BinaryFile

Modified: pymoul/trunk/src/moul/crypt/whatdoyousee.py
===================================================================
--- pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/crypt/whatdoyousee.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -28,6 +28,7 @@
 __version__ = "$Id$"
 __revision__ = "$Revision$"
 
+import os
 import struct
 from crypttea import LITTLE_ENDIAN
 from crypttea import XTEA
@@ -47,6 +48,9 @@
     fin - open file descriptor in read only and binary mode
     return - string
     """
+    # LLL:
+    if not os.environ.get("MOUL_ALLOW_CRYPT"):
+        raise RuntimeError("The usage of this function has been restricted")
     fin.seek(0)
     header = fin.read(12)
     if header != HEADER:
@@ -81,6 +85,9 @@
     fout - out file descriptor in write and binary mode
     return - None
     """
+    # LLL:
+    if not os.environ.get("MOUL_ALLOW_CRYPT"):
+        raise RuntimeError("The usage of this function has been restricted")
     # XXX: dos format
     instr = instr.replace("\n", "\r\n")
     fout.seek(0)

Modified: pymoul/trunk/src/moul/file/directory.py
===================================================================
--- pymoul/trunk/src/moul/file/directory.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/file/directory.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -29,8 +29,8 @@
 from moul.file.kiimage import KIImageFixer
 from moul.file.localization import LocDirParser
 from moul.file.plasmalog import PlasmalogZipper
-from moul.file.wdysini import AudioIni
-from moul.file.wdysini import GraphicsIni
+# LLL: from moul.file.wdysini import AudioIni
+# LLL: from moul.file.wdysini import GraphicsIni
 
 
 LOG = getLogger('moul.file.directory')
@@ -176,8 +176,8 @@
         'logzipper' : (PlasmalogZipper, ('log', 'zipped')),
         'kiimages' : (KIImageFixer, ('kiimages', 'fixed')),
         'avatars' : (KIImageFixer, ('avatars', 'fixed')),
-        'graphicsini' : (GraphicsIni, ('ini',)),
-        'audioini' : (AudioIni, ('ini',)),
+        # LLL: 'graphicsini' : (GraphicsIni, ('ini',)),
+        # LLL: 'audioini' : (AudioIni, ('ini',)),
         'chatmover' : (ChatlogMover, ('log', 'chatlogs')),
         'chatview' : (ChatlogDirectoryView, ('chatlogs',)),
         'zipped' : (DirectoryCount, ('zipped',)),

Modified: pymoul/trunk/src/moul/file/plasmalog.py
===================================================================
--- pymoul/trunk/src/moul/file/plasmalog.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/file/plasmalog.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -28,7 +28,6 @@
 from logging import getLogger
 from stat import ST_MTIME
 
-from moul.crypt.elf import decryptElf
 from moul.file.utils import fileModTime
 
 
@@ -41,7 +40,7 @@
     """Zip plasma logs
     """
     _save_patterns = ['*.elf', '*.txt', '*.log', '*.zip', '*.jpg']
-    
+
     def __init__(self, srcdir, destdir):
         self._srcdir = srcdir
         self._destdir = destdir

Modified: pymoul/trunk/src/moul/file/tests/test_directory.py
===================================================================
--- pymoul/trunk/src/moul/file/tests/test_directory.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/file/tests/test_directory.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -66,15 +66,15 @@
 
         self.urudir = self.klass(tmpdir)
         self.failIf(self.urudir.exists())
-        self.failIf(self.urudir.factory('audioini').exists())
-        self.failIf(self.urudir.factory('graphicsini').exists())
+        # LLL: self.failIf(self.urudir.factory('audioini').exists())
+        # LLL: self.failIf(self.urudir.factory('graphicsini').exists())
 
         os.mkdir(tmpdir) # XXX
         self.urudir.createTree()
         self.failUnless(self.urudir.exists())
         self.urudir.initializeFactories()
-        self.failIf(self.urudir.audioini.exists())
-        self.failIf(self.urudir.graphicsini.exists())
+        # LLL: self.failIf(self.urudir.audioini.exists())
+        # LLL: self.failIf(self.urudir.graphicsini.exists())
 
     def test_create(self):
         # setup a new, empty testing direcotry
@@ -86,13 +86,13 @@
         self.failUnless(self.urudir.exists())
         self.urudir.initializeFactories()
 
-        self.failIf(self.urudir.audioini.exists())
-        self.urudir.audioini.create()
-        self.failUnless(self.urudir.audioini.exists())
+        # LLL: self.failIf(self.urudir.audioini.exists())
+        # LLL: self.urudir.audioini.create()
+        # LLL: self.failUnless(self.urudir.audioini.exists())
 
-        self.failIf(self.urudir.graphicsini.exists())
-        self.urudir.graphicsini.create()
-        self.failUnless(self.urudir.graphicsini.exists())
+        # LLL: self.failIf(self.urudir.graphicsini.exists())
+        # LLL: self.urudir.graphicsini.create()
+        # LLL: self.failUnless(self.urudir.graphicsini.exists())
 
 class UruGameDirTest(AbstractTest):
     klass = UruGameDataDirectory

Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/qt/mainwindow.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -47,7 +47,7 @@
 from moul.qt.ui.mainwindow import Ui_MainWindow
 from moul.qt.utils import QThreadlet
 from moul.qt.utils import QYieldingThreadlet
-from moul.qt.wdysini import IniFileContainer
+# LLL: from moul.qt.wdysini import IniFileContainer
 
 
 LOG = getLogger('moul.qt')
@@ -86,7 +86,7 @@
         # init handlers
         self.qcDniTimeNumber = DniTimeNumberContainer(self)
         self.qcLocalization = LocalizationContainer(self)
-        self.qcIniFile = IniFileContainer(self)
+        # LLL: self.qcIniFile = IniFileContainer(self)
         self._ping_init()
         #self._systray_init()
         self._about_init()

Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.py	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.py	2007-03-21 12:39:25 UTC (rev 275)
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file './src/moul/qt/ui/mainwindow.ui'
 #
-# Created: Mon Mar 19 14:34:52 2007
+# Created: Wed Mar 21 13:00:59 2007
 #      by: PyQt4 UI code generator 4.1.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -146,6 +146,7 @@
         self.tab_settings.setObjectName("tab_settings")
 
         self.tab_sub_settings = QtGui.QTabWidget(self.tab_settings)
+        self.tab_sub_settings.setEnabled(False)
         self.tab_sub_settings.setGeometry(QtCore.QRect(0,0,491,411))
         self.tab_sub_settings.setObjectName("tab_sub_settings")
 
@@ -197,7 +198,7 @@
         self.hboxlayout2.addWidget(self.groupBox_screenres)
 
         self.groupBox_gra_checkboxes = QtGui.QGroupBox(self.horizontalLayout_4)
-        self.groupBox_gra_checkboxes.setEnabled(True)
+        self.groupBox_gra_checkboxes.setEnabled(False)
         self.groupBox_gra_checkboxes.setObjectName("groupBox_gra_checkboxes")
 
         self.verticalLayout_28 = QtGui.QWidget(self.groupBox_gra_checkboxes)
@@ -229,7 +230,7 @@
         self.hboxlayout2.addWidget(self.groupBox_gra_checkboxes)
 
         self.groupBox_gra_quality = QtGui.QGroupBox(self.tab_graphics)
-        self.groupBox_gra_quality.setEnabled(True)
+        self.groupBox_gra_quality.setEnabled(False)
         self.groupBox_gra_quality.setGeometry(QtCore.QRect(10,90,451,281))
         self.groupBox_gra_quality.setObjectName("groupBox_gra_quality")
 
@@ -462,7 +463,7 @@
         self.tab_audio.setObjectName("tab_audio")
 
         self.groupBox_aud_hardware = QtGui.QGroupBox(self.tab_audio)
-        self.groupBox_aud_hardware.setEnabled(True)
+        self.groupBox_aud_hardware.setEnabled(False)
         self.groupBox_aud_hardware.setGeometry(QtCore.QRect(10,250,451,111))
         self.groupBox_aud_hardware.setObjectName("groupBox_aud_hardware")
 
@@ -525,7 +526,7 @@
         self.cb_aud_eax.setObjectName("cb_aud_eax")
 
         self.groupBox_voicechat = QtGui.QGroupBox(self.tab_audio)
-        self.groupBox_voicechat.setEnabled(True)
+        self.groupBox_voicechat.setEnabled(False)
         self.groupBox_voicechat.setGeometry(QtCore.QRect(10,190,451,51))
         self.groupBox_voicechat.setObjectName("groupBox_voicechat")
 
@@ -534,7 +535,7 @@
         self.cb_aud_voicechat.setObjectName("cb_aud_voicechat")
 
         self.groupBox_aud_level = QtGui.QGroupBox(self.tab_audio)
-        self.groupBox_aud_level.setEnabled(True)
+        self.groupBox_aud_level.setEnabled(False)
         self.groupBox_aud_level.setGeometry(QtCore.QRect(10,0,451,181))
         self.groupBox_aud_level.setObjectName("groupBox_aud_level")
 

Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.ui
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.ui	2007-03-21 12:33:30 UTC (rev 274)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.ui	2007-03-21 12:39:25 UTC (rev 275)
@@ -349,6 +349,9 @@
       <string>Settings</string>
      </attribute>
      <widget class="QTabWidget" name="tab_sub_settings" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
       <property name="geometry" >
        <rect>
         <x>0</x>
@@ -451,7 +454,7 @@
          <item>
           <widget class="QGroupBox" name="groupBox_gra_checkboxes" >
            <property name="enabled" >
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
            <property name="title" >
             <string>Other</string>
@@ -511,7 +514,7 @@
        </widget>
        <widget class="QGroupBox" name="groupBox_gra_quality" >
         <property name="enabled" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="geometry" >
          <rect>
@@ -981,7 +984,7 @@
        </attribute>
        <widget class="QGroupBox" name="groupBox_aud_hardware" >
         <property name="enabled" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="geometry" >
          <rect>
@@ -1128,7 +1131,7 @@
        </widget>
        <widget class="QGroupBox" name="groupBox_voicechat" >
         <property name="enabled" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="geometry" >
          <rect>
@@ -1157,7 +1160,7 @@
        </widget>
        <widget class="QGroupBox" name="groupBox_aud_level" >
         <property name="enabled" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
         <property name="geometry" >
          <rect>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.