Merge lp:~richies/hypernucleus-server/UberHax_Broken_MadScientist into lp:~hypernucleus/hypernucleus-server/trunk

[Richie Ward]

Huge sweeping changes to the model

=== modified file 'hypernucleusserver/hypernucleusserver/model/board.py'
--- hypernucleusserver/hypernucleusserver/model/board.py	2011-06-18 20:38:51 +0000
+++ hypernucleusserver/hypernucleusserver/model/board.py	2011-06-21 20:38:13 +0000
@@ -2,7 +2,7 @@
 from sqlalchemy import Column, Integer, ForeignKey, Unicode, UniqueConstraint
 from sqlalchemy import DateTime
 from sqlalchemy.orm import relationship
-from hypernucleusserver.models import Tags, BBThreadTags
+from hypernucleusserver.model.tags import Tags, BBThreadTags
 from hypernucleusserver.models import Base as DeclarativeBase
 from hypernucleusserver.model.file import Files
 from hypernucleusserver.model.auth import User

=== modified file 'hypernucleusserver/hypernucleusserver/model/content.py'
--- hypernucleusserver/hypernucleusserver/model/content.py	2011-06-20 14:35:59 +0000
+++ hypernucleusserver/hypernucleusserver/model/content.py	2011-06-21 20:38:13 +0000
@@ -1,7 +1,8 @@
 from datetime import datetime
 from sqlalchemy import ForeignKey, Column, UniqueConstraint, desc
 from sqlalchemy.types import Integer, Unicode, DateTime, Boolean
-from hypernucleusserver.models import Tags, ContentTags, User
+from hypernucleusserver.model.tags import Tags, ContentTags
+from hypernucleusserver.model.auth import User
 from hypernucleusserver.models import Base as DeclarativeBase
 from sqlalchemy.orm import relationship
 

=== removed file 'hypernucleusserver/hypernucleusserver/model/dependencies.py'
--- hypernucleusserver/hypernucleusserver/model/dependencies.py	2011-06-20 14:43:33 +0000
+++ hypernucleusserver/hypernucleusserver/model/dependencies.py	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-from datetime import datetime
-from sqlalchemy import Column, Integer, desc
-from sqlalchemy import ForeignKey, UniqueConstraint, Float, DateTime, Boolean
-from sqlalchemy import Unicode
-from sqlalchemy.orm import relationship
-from hypernucleusserver.models import Base as DeclarativeBase
-from hypernucleusserver.models import Tags, DependenciesTags
-from hypernucleusserver.models import OperatingSystems
-from hypernucleusserver.models import Architectures, GameDepModuleType
-from hypernucleusserver.model.file import Files
-from hypernucleusserver.model.auth import User
-
-class DependenciesPicture(DeclarativeBase):
-    __tablename__ = 'dependenciespicture'
-    __table_args__ = (UniqueConstraint('game_id', 'file_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    game_id = Column(Integer, ForeignKey('dependenciespage.id'), nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-    
-class DependenciesBinaryFiles(DeclarativeBase):
-    __tablename__ = 'dependenciesbinaryfiles'
-    __table_args__ = (UniqueConstraint('binary_id', 'file_id'),
-                    {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-                    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('dependenciesbinary.id'), 
-                        nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-    
-class DependenciesBinaryOperatingSystem(DeclarativeBase):
-    __tablename__ = 'dependenciesbinaryoperatingsystem'
-    __table_args__ = (UniqueConstraint('binary_id', 'operatingsystem_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('dependenciesbinary.id'), 
-                    nullable=False)
-    operatingsystem_id = Column(Integer, ForeignKey('operatingsystems.id'), 
-                                nullable=False)
-    
-class DependenciesBinaryArchitecture(DeclarativeBase):
-    __tablename__ = 'dependenciesbinaryarchitecture'
-    __table_args__ = (UniqueConstraint('binary_id', 'architecture_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('dependenciesbinary.id'), 
-                        nullable=False)
-    architecture_id = Column(Integer, ForeignKey('architectures.id'), 
-                                nullable=False)
-    
-class DependenciesBinary(DeclarativeBase):
-    __tablename__ = 'dependenciesbinary'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('dependenciesrevision.id'), 
-                         nullable=False)
-    file_obj = relationship(Files, 
-                            secondary=DependenciesBinaryFiles.__table__, 
-                            uselist=False, single_parent=True,
-                            cascade="all, delete, delete-orphan")
-    operatingsystem_obj = relationship(OperatingSystems, 
-                        secondary=DependenciesBinaryOperatingSystem.__table__, 
-                        uselist=False)
-    architecture_obj = relationship(Architectures, 
-                            secondary=DependenciesBinaryArchitecture.__table__, 
-                            uselist=False)
-                            
-    def __init__(self, file_obj, operatingsystem_obj, architecture_obj):
-        self.file_obj = file_obj
-        self.operatingsystem_obj = operatingsystem_obj
-        self.architecture_obj = architecture_obj
-        
-class DependenciesDependency(DeclarativeBase):
-    __tablename__ = 'dependenciesdependency'
-    __table_args__ = (UniqueConstraint('game_id', 'dependency_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    game_id = Column(Integer, ForeignKey('dependenciespage.id'), 
-                                                        nullable=False)
-    dependency_id = Column(Integer, ForeignKey('dependenciespage.id'), 
-                                                        nullable=False)
-
-class DependenciesRevisionFiles(DeclarativeBase):
-    __tablename__ = 'dependenciesrevisionfiles'
-    __table_args__ = (UniqueConstraint('revision_id', 'file_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('dependenciesrevision.id'), 
-                            nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-
-class DependenciesModuleTypeRevision(DeclarativeBase):
-    __tablename__ = 'dependenciesmoduletyperevision'
-    __table_args__ = (UniqueConstraint('revision_id', 'moduletype_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('dependenciesrevision.id'), 
-                            nullable=False)
-    moduletype_id = Column(Integer, ForeignKey('gamedepmoduletype.id'), 
-                           nullable=False)
-
-class DependenciesRevision(DeclarativeBase):
-    __tablename__ = 'dependenciesrevision'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    page_id = Column(Integer, ForeignKey('dependenciespage.id'), 
-                                                        nullable=False)
-    version = Column(Float(), default=0.1, index=True, nullable=False)
-    created = Column(DateTime, default=datetime.now)
-    published = Column(Boolean, default=False, index=True)
-    page = relationship("DependenciesPage")
-    moduletype = relationship(GameDepModuleType, 
-                              secondary=DependenciesModuleTypeRevision.__table__, 
-                              uselist=False)
-    file_obj = relationship(Files, 
-                            secondary=DependenciesRevisionFiles.__table__, 
-                            uselist=False)
-    binary = relationship(DependenciesBinary, 
-                            cascade="all, delete")
-                            
-    def __init__(self, version, moduletype):
-        self.version = version
-        self.moduletype = moduletype
-    
-class DependenciesPage(DeclarativeBase):
-    __tablename__ = 'dependenciespage'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode(128), index=True, unique=True, nullable=False)
-    display_name = Column(Unicode(128), index=True, nullable=False)
-    description = Column(Unicode(16384), default=u"")
-    created = Column(DateTime, default=datetime.now)
-    deleted = Column(Boolean, default=False, index=True)
-    revisions = relationship(DependenciesRevision, 
-                                cascade="all, delete, delete-orphan",
-                                lazy="dynamic",
-                                order_by=desc(DependenciesRevision.id),
-                                single_parent=True)
-    tags = relationship(Tags, secondary=DependenciesTags.__table__,
-                        cascade="all, delete")
-    dependencies = relationship('DependenciesPage', 
-                secondary=DependenciesDependency.__table__,
-                
-                primaryjoin=id == DependenciesDependency.game_id,
-                secondaryjoin=DependenciesDependency.dependency_id == id,
-                cascade="all, delete")
-    picture = relationship(Files, secondary=DependenciesPicture.__table__, 
-                            cascade="all, delete")
-                            
-    def __init__(self, name, display_name):
-        self.name = name
-        self.display_name = display_name
-

=== modified file 'hypernucleusserver/hypernucleusserver/model/gamedep.py'
--- hypernucleusserver/hypernucleusserver/model/gamedep.py	2010-12-16 05:24:55 +0000
+++ hypernucleusserver/hypernucleusserver/model/gamedep.py	2011-06-21 20:38:13 +0000
@@ -1,5 +1,18 @@
-from sqlalchemy import Column, Integer, Unicode
+from sqlalchemy import Column, Integer, desc, Unicode
+from sqlalchemy import ForeignKey, UniqueConstraint, Float, DateTime, Boolean
+from sqlalchemy.orm import relationship
 from hypernucleusserver.models import Base as DeclarativeBase
+from hypernucleusserver.model.file import Files
+from hypernucleusserver.model.tags import Tags, GameDepTags
+from datetime import datetime
+class GameDepType(DeclarativeBase):
+    __tablename__ = 'gamedeptype'
+    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
+    id = Column(Integer, primary_key=True)
+    name = Column(Unicode(128), index=True, unique=True, nullable=False)
+
+    def __init__(self, name):
+        self.name = name
 
 class GameDepModuleType(DeclarativeBase):
     __tablename__ = 'gamedepmoduletype'
@@ -37,3 +50,162 @@
     def __init__(self, name, display_name):
         self.name = name
         self.display_name = display_name
+
+
+
+class GameDepPicture(DeclarativeBase):
+    __tablename__ = 'gamedeppicture'
+    __table_args__ = (UniqueConstraint('game_id', 'file_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    game_id = Column(Integer, ForeignKey('gamedeppage.id'), nullable=False)
+    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
+    
+class GameDepBinaryFiles(DeclarativeBase):
+    __tablename__ = 'gamedepbinaryfiles'
+    __table_args__ = (UniqueConstraint('binary_id', 'file_id'),
+                    {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+                    
+    id = Column(Integer, primary_key=True)
+    binary_id = Column(Integer, ForeignKey('gamedepbinary.id'), 
+                        nullable=False)
+    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
+    
+class GameDepBinaryOperatingSystem(DeclarativeBase):
+    __tablename__ = 'gamedepbinaryoperatingsystem'
+    __table_args__ = (UniqueConstraint('binary_id', 'operatingsystem_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    binary_id = Column(Integer, ForeignKey('gamedepbinary.id'), 
+                    nullable=False)
+    operatingsystem_id = Column(Integer, ForeignKey('operatingsystems.id'), 
+                                nullable=False)
+    
+class GameDepBinaryArchitecture(DeclarativeBase):
+    __tablename__ = 'gamedepbinaryarchitecture'
+    __table_args__ = (UniqueConstraint('binary_id', 'architecture_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    binary_id = Column(Integer, ForeignKey('gamedepbinary.id'), 
+                        nullable=False)
+    architecture_id = Column(Integer, ForeignKey('architectures.id'), 
+                                nullable=False)
+    
+class GameDepBinary(DeclarativeBase):
+    __tablename__ = 'gamedepbinary'
+    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
+    
+    id = Column(Integer, primary_key=True)
+    revision_id = Column(Integer, ForeignKey('gamedeprevision.id'), 
+                         nullable=False)
+    file_obj = relationship(Files, 
+                            secondary=GameDepBinaryFiles.__table__, 
+                            uselist=False, single_parent=True,
+                            cascade="all, delete, delete-orphan")
+    operatingsystem_obj = relationship(OperatingSystems, 
+                        secondary=GameDepBinaryOperatingSystem.__table__, 
+                        uselist=False)
+    architecture_obj = relationship(Architectures, 
+                            secondary=GameDepBinaryArchitecture.__table__, 
+                            uselist=False)
+                            
+    def __init__(self, file_obj, operatingsystem_obj, architecture_obj):
+        self.file_obj = file_obj
+        self.operatingsystem_obj = operatingsystem_obj
+        self.architecture_obj = architecture_obj
+        
+class GameDepDependency(DeclarativeBase):
+    __tablename__ = 'gamedepdependency'
+    __table_args__ = (UniqueConstraint('game_id', 'dependency_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    game_id = Column(Integer, ForeignKey('gamedeppage.id'), 
+                                                        nullable=False)
+    dependency_id = Column(Integer, ForeignKey('gamedeppage.id'), 
+                                                        nullable=False)
+
+class GameDepRevisionFiles(DeclarativeBase):
+    __tablename__ = 'gamedeprevisionfiles'
+    __table_args__ = (UniqueConstraint('revision_id', 'file_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    revision_id = Column(Integer, ForeignKey('gamedeprevision.id'), 
+                            nullable=False)
+    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
+
+class GameDepModuleTypeRevision(DeclarativeBase):
+    __tablename__ = 'gamedepmoduletyperevision'
+    __table_args__ = (UniqueConstraint('revision_id', 'moduletype_id'),
+                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
+    
+    id = Column(Integer, primary_key=True)
+    revision_id = Column(Integer, ForeignKey('gamedeprevision.id'), 
+                            nullable=False)
+    moduletype_id = Column(Integer, ForeignKey('gamedepmoduletype.id'), 
+                           nullable=False)
+
+
+
+
+class GameDepRevision(DeclarativeBase):
+    __tablename__ = 'gamedeprevision'
+    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
+    
+    id = Column(Integer, primary_key=True)
+    page_id = Column(Integer, ForeignKey('gamedeppage.id'), 
+                                                        nullable=False)
+    page = relationship("GameDepPage")
+    version = Column(Float(), default=0.1, index=True, nullable=False)
+    created = Column(DateTime, default=datetime.now)
+    published = Column(Boolean, default=False, index=True)
+    moduletype = relationship(GameDepModuleType, 
+                              secondary=GameDepModuleTypeRevision.__table__, 
+                              uselist=False)
+    file_obj = relationship(Files, 
+                            secondary=GameDepRevisionFiles.__table__, 
+                            uselist=False)
+    binary = relationship(GameDepBinary, 
+                            cascade="all, delete")
+                            
+    def __init__(self, version, moduletype):
+        self.version = version
+        self.moduletype = moduletype
+
+class GameDepPage(DeclarativeBase):
+    __tablename__ = 'gamedeppage'
+    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
+    
+    id = Column(Integer, primary_key=True)
+    gamedeptype_id = Column(Integer, ForeignKey('gamedeptype.id'), 
+                            nullable=False)
+    gamedeptype = relationship(GameDepType, uselist=False)
+    name = Column(Unicode(128), index=True, unique=True, nullable=False)
+    display_name = Column(Unicode(128), index=True, nullable=False)
+    description = Column(Unicode(16384), default=u"")
+    created = Column(DateTime, default=datetime.now)
+    deleted = Column(Boolean, default=False, index=True)
+    revisions = relationship(GameDepRevision, 
+                                cascade="all, delete, delete-orphan",
+                                lazy="dynamic",
+                                order_by=desc(GameDepRevision.id),
+                                single_parent=True)
+    tags = relationship(Tags, secondary=GameDepTags.__table__,
+                        cascade="all, delete")
+    dependencies = relationship('GameDepPage', 
+                secondary=GameDepDependency.__table__,
+                
+                primaryjoin=id == GameDepDependency.game_id,
+                secondaryjoin=GameDepDependency.dependency_id == id,
+                cascade="all, delete")
+    picture = relationship(Files, secondary=GameDepPicture.__table__, 
+                            cascade="all, delete")
+                            
+    def __init__(self, gamedeptype, name, display_name):
+        self.name = name
+        self.display_name = display_name
+        self.gamedeptype = gamedeptype
\ No newline at end of file

=== removed file 'hypernucleusserver/hypernucleusserver/model/games.py'
--- hypernucleusserver/hypernucleusserver/model/games.py	2011-06-20 14:43:33 +0000
+++ hypernucleusserver/hypernucleusserver/model/games.py	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-from datetime import datetime
-from sqlalchemy import Column, Integer, desc
-from sqlalchemy import ForeignKey, UniqueConstraint, Float, DateTime, Boolean
-from sqlalchemy import Unicode
-from sqlalchemy.orm import relationship
-from hypernucleusserver.models import Base as DeclarativeBase
-from hypernucleusserver.models import Tags, GamesTags
-from hypernucleusserver.models import OperatingSystems
-from hypernucleusserver.models import Architectures, GameDepModuleType
-from hypernucleusserver.model.file import Files
-from hypernucleusserver.model.auth import User
-
-class GamesPicture(DeclarativeBase):
-    __tablename__ = 'gamespicture'
-    __table_args__ = (UniqueConstraint('game_id', 'file_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    game_id = Column(Integer, ForeignKey('gamespage.id'), nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-    
-class GamesBinaryFiles(DeclarativeBase):
-    __tablename__ = 'gamesbinaryfiles'
-    __table_args__ = (UniqueConstraint('binary_id', 'file_id'),
-                    {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-                    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('gamesbinary.id'), 
-                        nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-    
-class GamesBinaryOperatingSystem(DeclarativeBase):
-    __tablename__ = 'gamesbinaryoperatingsystem'
-    __table_args__ = (UniqueConstraint('binary_id', 'operatingsystem_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('gamesbinary.id'), 
-                    nullable=False)
-    operatingsystem_id = Column(Integer, ForeignKey('operatingsystems.id'), 
-                                nullable=False)
-    
-class GamesBinaryArchitecture(DeclarativeBase):
-    __tablename__ = 'gamesbinaryarchitecture'
-    __table_args__ = (UniqueConstraint('binary_id', 'architecture_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    binary_id = Column(Integer, ForeignKey('gamesbinary.id'), 
-                        nullable=False)
-    architecture_id = Column(Integer, ForeignKey('architectures.id'), 
-                                nullable=False)
-    
-class GamesBinary(DeclarativeBase):
-    __tablename__ = 'gamesbinary'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('gamesrevision.id'), 
-                         nullable=False)
-    file_obj = relationship(Files, 
-                            secondary=GamesBinaryFiles.__table__, 
-                            uselist=False, single_parent=True,
-                            cascade="all, delete, delete-orphan")
-    operatingsystem_obj = relationship(OperatingSystems, 
-                        secondary=GamesBinaryOperatingSystem.__table__, 
-                        uselist=False)
-    architecture_obj = relationship(Architectures, 
-                            secondary=GamesBinaryArchitecture.__table__, 
-                            uselist=False)
-                            
-    def __init__(self, file_obj, operatingsystem_obj, architecture_obj):
-        self.file_obj = file_obj
-        self.operatingsystem_obj = operatingsystem_obj
-        self.architecture_obj = architecture_obj
-        
-class GamesDependency(DeclarativeBase):
-    __tablename__ = 'gamesdependency'
-    __table_args__ = (UniqueConstraint('game_id', 'dependency_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    game_id = Column(Integer, ForeignKey('gamespage.id'), 
-                                                        nullable=False)
-    dependency_id = Column(Integer, ForeignKey('dependenciespage.id'), 
-                                                        nullable=False)
-    
-class GamesRevisionFiles(DeclarativeBase):
-    __tablename__ = 'gamesrevisionfiles'
-    __table_args__ = (UniqueConstraint('revision_id', 'file_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('gamesrevision.id'), 
-                            nullable=False)
-    file_id = Column(Integer, ForeignKey('files.id'), nullable=False)
-
-class GamesModuleTypeRevision(DeclarativeBase):
-    __tablename__ = 'gamesmoduletyperevision'
-    __table_args__ = (UniqueConstraint('revision_id', 'moduletype_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    revision_id = Column(Integer, ForeignKey('gamesrevision.id'), 
-                            nullable=False)
-    moduletype_id = Column(Integer, ForeignKey('gamedepmoduletype.id'), 
-                           nullable=False)
-
-class GamesRevision(DeclarativeBase):
-    __tablename__ = 'gamesrevision'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    page_id = Column(Integer, ForeignKey('gamespage.id'), 
-                     nullable=False)
-    version = Column(Float(), default=0.1, index=True, nullable=False)
-    created = Column(DateTime, default=datetime.now)
-    published = Column(Boolean, default=False, index=True)
-    page = relationship("GamesPage")
-    moduletype = relationship(GameDepModuleType, 
-                              secondary=GamesModuleTypeRevision.__table__, 
-                              uselist=False)
-    file_obj = relationship(Files, 
-                            secondary=GamesRevisionFiles.__table__, 
-                            uselist=False)
-    binary = relationship(GamesBinary, 
-                            cascade="all, delete")
-                            
-    def __init__(self, version, moduletype):
-        self.version = version
-        self.moduletype = moduletype
-    
-class GamesPage(DeclarativeBase):
-    __tablename__ = 'gamespage'
-    __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
-    
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode(128), index=True, unique=True, nullable=False)
-    display_name = Column(Unicode(128), index=True, nullable=False)
-    description = Column(Unicode(16384), default=u"")
-    created = Column(DateTime, default=datetime.now)
-    deleted = Column(Boolean, default=False, index=True)
-    revisions = relationship(GamesRevision, 
-                                cascade="all, delete, delete-orphan",
-                                lazy="dynamic",
-                                order_by=desc(GamesRevision.id),
-                                single_parent=True)
-    tags = relationship(Tags, secondary=GamesTags.__table__,
-                        cascade="all, delete")
-    dependencies = relationship('DependenciesPage', 
-                secondary=GamesDependency.__table__,
-                cascade="all, delete")
-    picture = relationship(Files, secondary=GamesPicture.__table__, 
-                            cascade="all, delete")
-                            
-    def __init__(self, name, display_name):
-        self.name = name
-        self.display_name = display_name
-

=== modified file 'hypernucleusserver/hypernucleusserver/model/tags.py'
--- hypernucleusserver/hypernucleusserver/model/tags.py	2011-06-18 10:18:12 +0000
+++ hypernucleusserver/hypernucleusserver/model/tags.py	2011-06-21 20:38:13 +0000
@@ -11,28 +11,14 @@
     def __init__(self, name):
         self.name = name
 
-class DependenciesTags(DeclarativeBase):
-    __tablename__ = 'dependenciestags'
-    __table_args__ = (UniqueConstraint('tag_id', 'dependency_id'),
-                        {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
-    
-    id = Column(Integer, primary_key=True)
-    tag_id = Column(Integer, ForeignKey('tags.id'), nullable=False)
-    dependency_id = Column(Integer, ForeignKey('dependenciespage.id'), 
-                                                            nullable=False)
-
-    def __init__(self, tag_id, dependency_id):
-        self.tag_id = tag_id
-        self.dependency_id = dependency_id
-        
-class GamesTags(DeclarativeBase):
-    __tablename__ = 'gamestags'
+class GameDepTags(DeclarativeBase):
+    __tablename__ = 'gamedeptags'
     __table_args__ = (UniqueConstraint('tag_id', 'game_id'),
                         {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
     
     id = Column(Integer, primary_key=True)
     tag_id = Column(Integer, ForeignKey('tags.id'), nullable=False)
-    game_id = Column(Integer, ForeignKey('gamespage.id'), nullable=False)
+    game_id = Column(Integer, ForeignKey('gamedeppage.id'), nullable=False)
     
     def __init__(self, game_id, tag_id):
         self.game_id = game_id

=== modified file 'hypernucleusserver/hypernucleusserver/model/tokens.py'
--- hypernucleusserver/hypernucleusserver/model/tokens.py	2011-06-20 14:35:59 +0000
+++ hypernucleusserver/hypernucleusserver/model/tokens.py	2011-06-21 20:38:13 +0000
@@ -3,7 +3,7 @@
 from sqlalchemy.orm import relationship
 from datetime import datetime, timedelta
 from hypernucleusserver.models import Base as DeclarativeBase
-from hypernucleusserver.models import User
+from hypernucleusserver.model.auth import User
 import uuid
 
 def gen_token():

=== modified file 'hypernucleusserver/hypernucleusserver/models.py'
--- hypernucleusserver/hypernucleusserver/models.py	2011-06-21 17:37:46 +0000
+++ hypernucleusserver/hypernucleusserver/models.py	2011-06-21 20:38:13 +0000
@@ -9,61 +9,25 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy import create_engine
-
 from zope.sqlalchemy import ZopeTransactionExtension
 
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
-from hypernucleusserver.model.gamedep import GameDepModuleType
-from hypernucleusserver.model.gamedep import OperatingSystems, Architectures
-from hypernucleusserver.model.tags import Tags, DependenciesTags, GamesTags
-from hypernucleusserver.model.tags import ContentTags, BBThreadTags
-from hypernucleusserver.model.auth import Sexes, User, Group, ACLParent
-from hypernucleusserver.model.auth import ACLChild, UserGroup
-from hypernucleusserver.model.auth import UserSexes
+from hypernucleusserver.model.auth import ACLParent, ACLChild, User, Group
+from hypernucleusserver.model.auth import Sexes
+from hypernucleusserver.model.gamedep import Architectures, OperatingSystems
+from hypernucleusserver.model.gamedep import GameDepModuleType, GameDepPage
+from hypernucleusserver.model.gamedep import GameDepType
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoInfo
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoError
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoWarn
 from hypernucleusserver.model.content import ContentPage, ContentRevision
 from hypernucleusserver.model.board import BBCategory, BBPost
 from hypernucleusserver.model.board import BBThread, BBForum
-from hypernucleusserver.model.file import Files, FilesData
-from hypernucleusserver.model.tokens import Token
-from hypernucleusserver.model.errwarninfo import ErrWarnInfoInfo
-from hypernucleusserver.model.errwarninfo import ErrWarnInfoError
-from hypernucleusserver.model.errwarninfo import ErrWarnInfoWarn
-
-from hypernucleusserver.model.dependencies import DependenciesBinary
-from hypernucleusserver.model.dependencies import \
-                                    DependenciesBinaryArchitecture
-from hypernucleusserver.model.dependencies import \
-                                    DependenciesBinaryFiles
-from hypernucleusserver.model.dependencies import \
-                                    DependenciesBinaryOperatingSystem
-from hypernucleusserver.model.dependencies import DependenciesPage
-from hypernucleusserver.model.dependencies import DependenciesPicture
-from hypernucleusserver.model.dependencies import DependenciesRevision
-from hypernucleusserver.model.dependencies import \
-                                    DependenciesRevisionFiles
-from hypernucleusserver.model.dependencies import \
-                                    DependenciesModuleTypeRevision
-
-from hypernucleusserver.model.games import GamesBinary
-from hypernucleusserver.model.games import \
-                                    GamesBinaryArchitecture
-from hypernucleusserver.model.games import \
-                                    GamesBinaryFiles
-from hypernucleusserver.model.games import \
-                                    GamesBinaryOperatingSystem
-from hypernucleusserver.model.games import GamesPage
-from hypernucleusserver.model.games import GamesPicture
-from hypernucleusserver.model.games import GamesRevision
-from hypernucleusserver.model.games import \
-                                    GamesRevisionFiles
-from hypernucleusserver.model.games import \
-                                    GamesModuleTypeRevision
-
-                                    
+from hypernucleusserver.model.tags import Tags
+
 class RootFactory(object):
     __acl__ = set()
     
@@ -341,25 +305,29 @@
     session.add(pygame)
     session.add(pcgame)
     
+    # Add the GameDepTypes
+    gametype = GameDepType(u"game")
+    deptype = GameDepType(u"dep")
+    
     # Add some primitive games and dependencies
-    depzero = DependenciesPage(u"testzero", u"Test Zero")
+    depzero = GameDepPage(deptype, u"testzero", u"Test Zero")
     session.add(depzero)
-    depone = DependenciesPage(u"testdep", u"Test Dependency")
+    depone = GameDepPage(deptype, u"testdep", u"Test Dependency")
     depone.dependencies.append(depzero)
     depone.tags.append(first_tag)
     session.add(depone)
-    deptwo = DependenciesPage(u"testdeptwo", u"Test Dependency Two")
+    deptwo = GameDepPage(deptype, u"testdeptwo", u"Test Dependency Two")
     deptwo.dependencies.append(depzero)
     session.add(deptwo)
-    depthree = DependenciesPage(u"testdepthree", u"Test Dependency Three")
+    depthree = GameDepPage(deptype, u"testdepthree", u"Test Dependency Three")
     depthree.dependencies.append(deptwo)
     depthree.dependencies.append(depzero)
     session.add(depthree)
     
-    gameone = GamesPage(u"testgame", u"Test Game")
+    gameone = GameDepPage(gametype, u"testgame", u"Test Game")
     gameone.tags.append(first_tag)
     session.add(gameone)
-    gametwo = GamesPage(u"testgametwo", u"Test Game Two")
+    gametwo = GameDepPage(gametype, u"testgametwo", u"Test Game Two")
     gametwo.dependencies.append(depone)
     session.add(gametwo)
     

=== modified file 'hypernucleusserver/hypernucleusserver/security.py'
--- hypernucleusserver/hypernucleusserver/security.py	2010-12-16 05:24:55 +0000
+++ hypernucleusserver/hypernucleusserver/security.py	2011-06-21 20:38:13 +0000
@@ -1,4 +1,5 @@
-from hypernucleusserver.models import User, DBSession
+from hypernucleusserver.model.auth import User
+from hypernucleusserver.models import DBSession
 def groupfinder(userid, request):
     dbsession = DBSession()
     auth = dbsession.query(User).filter(User.name==unicode(userid)).first()

=== modified file 'hypernucleusserver/hypernucleusserver/viewlib/boardlib.py'
--- hypernucleusserver/hypernucleusserver/viewlib/boardlib.py	2011-06-18 17:05:05 +0000
+++ hypernucleusserver/hypernucleusserver/viewlib/boardlib.py	2011-06-21 20:38:13 +0000
@@ -1,5 +1,6 @@
-from hypernucleusserver.models import DBSession, BBCategory, BBForum, BBThread
-from hypernucleusserver.models import NoResultFound
+from hypernucleusserver.models import DBSession
+from sqlalchemy.orm.exc import NoResultFound
+from hypernucleusserver.model.board import BBCategory, BBForum, BBThread
 
 class CategoryNotFound(Exception):
     pass

=== modified file 'hypernucleusserver/hypernucleusserver/viewlib/contentlib.py'
--- hypernucleusserver/hypernucleusserver/viewlib/contentlib.py	2011-06-16 16:31:38 +0000
+++ hypernucleusserver/hypernucleusserver/viewlib/contentlib.py	2011-06-21 20:38:13 +0000
@@ -1,5 +1,6 @@
-from hypernucleusserver.models import DBSession, ContentPage
-from hypernucleusserver.models import ContentRevision, NoResultFound
+from hypernucleusserver.models import DBSession
+from sqlalchemy.orm.exc import NoResultFound
+from hypernucleusserver.model.content import ContentRevision, ContentPage
 from hypernucleusserver.viewlib.helpers import bbcode
 import transaction
 

=== modified file 'hypernucleusserver/hypernucleusserver/viewlib/gamedeplib.py'
--- hypernucleusserver/hypernucleusserver/viewlib/gamedeplib.py	2011-06-18 20:55:24 +0000
+++ hypernucleusserver/hypernucleusserver/viewlib/gamedeplib.py	2011-06-21 20:38:13 +0000
@@ -1,12 +1,9 @@
-from hypernucleusserver.models import DBSession, NoResultFound
-from hypernucleusserver.models import GameDepModuleType, \
-                                        OperatingSystems, Architectures
-from hypernucleusserver.model.dependencies import DependenciesBinary
-from hypernucleusserver.model.dependencies import DependenciesPage
-from hypernucleusserver.model.dependencies import DependenciesRevision
-from hypernucleusserver.model.games import GamesBinary
-from hypernucleusserver.model.games import GamesPage
-from hypernucleusserver.model.games import GamesRevision
+from hypernucleusserver.models import DBSession
+from sqlalchemy.orm.exc import NoResultFound
+from hypernucleusserver.model.gamedep import GameDepModuleType
+from hypernucleusserver.model.gamedep import OperatingSystems, Architectures
+from hypernucleusserver.model.gamedep import GameDepBinary, GameDepPage
+from hypernucleusserver.model.gamedep import GameDepRevision, GameDepType
 #from hypernucleusserver.viewlib.helpers import bbcode
 from hypernucleusserver.viewlib.filelib import AlchemyIO
 import transaction
@@ -63,18 +60,24 @@
         if not gamedep_type in [GAME, DEP]:
             raise InvalidGameDepType
         self.gamedep_type = gamedep_type
-        
+    
+    def get_gamedeptype(self):
+        if self.gamedep_type == GAME:
+            gamedeptype = DBSession.query(GameDepType).filter_by(
+                                                        name=u"game").one()
+        else:
+            gamedeptype = DBSession.query(GameDepType).filter_by(
+                                                        name=u"dep").one()
+        return gamedeptype
+    
     def list(self):
         """
         List all the pages
         """
         result = set()
-        if self.gamedep_type == GAME:
-            gamedeps = DBSession.query(GamesPage).filter_by(
-                                                            deleted=False)
-        else:
-            gamedeps = DBSession.query(DependenciesPage).filter_by(
-                                                            deleted=False)
+        gamedeptype = self.get_gamedeptype()
+        gamedeps = DBSession.query(GameDepPage).filter_by(
+                                gamedeptype_id=gamedeptype.id, deleted=False)
         if not gamedeps:
             raise GameDepNotFound
         for gamedep in gamedeps:
@@ -90,7 +93,8 @@
         display_name = unicode(display_name)
         description = unicode(description)
         if not self.exists(name, raise_if_found=True):
-            page = self.show(name)[0]
+            gamedeptype = self.get_gamedeptype()
+            page = GameDepPage(gamedeptype, name, display_name)
             page.description = description
             DBSession.add(page)
             transaction.commit()
@@ -119,10 +123,7 @@
         moduletype = self.get_moduletype(moduletype)
         if not self.exists(name, version, raise_if_found=True):
             page, rev = self.show(name)
-            if self.gamedep_type == GAME:
-                rev = GamesRevision(version, moduletype)
-            else:
-                rev = DependenciesRevision(version, moduletype)
+            rev = GameDepRevision(version, moduletype)
             page.revisions.append(rev)
             transaction.commit()
 
@@ -172,12 +173,8 @@
 
     def show_binary(self, binaryid):
         try:
-            if self.gamedep_type == GAME:
-                bin_obj = DBSession.query(GamesBinary).filter_by(
-                                                id=binaryid).one()
-            else:
-                bin_obj = DBSession.query(DependenciesBinary).filter_by(
-                                                id=binaryid).one()
+            bin_obj = DBSession.query(GameDepBinary).filter_by(
+                                            id=binaryid).one()
         except NoResultFound:
             raise GameDepNotFound
         return bin_obj
@@ -201,14 +198,8 @@
         aio = AlchemyIO(fle=binary, sess=DBSession, 
                         mime=mimetype, filename=filename)
         aio_obj = aio.write()
-        
-        if self.gamedep_type == GAME:
-            bin_obj = GamesBinary(aio_obj, os_obj, arch_obj)
-        else:
-            bin_obj = DependenciesBinary(aio_obj, os_obj, arch_obj)
-        
+        bin_obj = GameDepBinary(aio_obj, os_obj, arch_obj)
         rev.binary.append(bin_obj)
-        
         transaction.commit()
 
     def update_binary(self, name, revision, binaryid, operatingsystem, 
@@ -272,10 +263,12 @@
         """
         name = unicode(name)
         dep_id = int(dep_id)
-        
+        gamedeptype = DBSession.query(GameDepType).filter_by(
+                                                        name=u"dep").one()
         try:
-            dep = DBSession.query(DependenciesPage).filter_by(
-                                                            id=dep_id).one()
+            dep = DBSession.query(GameDepPage).filter_by(
+                                            gamedeptype_id=gamedeptype.id, 
+                                            deleted=False, id=dep_id).one()
         except NoResultFound:
             raise GameDepNotFound
         
@@ -334,11 +327,11 @@
         """
         name = unicode(name)
         try:
-            if self.gamedep_type == GAME:
-                page = DBSession.query(GamesPage).filter_by(name=name).one()
-            else:
-                page = DBSession.query(DependenciesPage).filter_by(
-                                                            name=name).one()
+            gamedeptype = self.get_gamedeptype()
+            page = DBSession.query(GameDepPage).filter_by(
+                                            name=name,
+                                            gamedeptype_id=gamedeptype.id, 
+                                            deleted=False).one()
         except NoResultFound:
             return False
         
@@ -413,7 +406,10 @@
         return archlist
     
     def dependency_dropdown(self):
-        page = DBSession.query(DependenciesPage.id, DependenciesPage.name)
+        gamedeptype = DBSession.query(GameDepType).filter_by(
+                                                        name=u"dep").one()
+        page = DBSession.query(GameDepPage.id, GameDepPage.name).filter_by(
+                                deleted=False, gamedeptype_id=gamedeptype.id)
         return page.all()
     
     def show(self, name, revision=None):
@@ -429,27 +425,23 @@
         
         if not revision:
             try:
-                if self.gamedep_type == GAME:
-                    page = DBSession.query(GamesPage).filter_by(
-                                                            name=name).one()
-                else:
-                    page = DBSession.query(DependenciesPage).filter_by(
-                                                            name=name).one()
+                gamedeptype = self.get_gamedeptype()
+                page = DBSession.query(GameDepPage).filter_by(
+                                                name=name,
+                                                gamedeptype_id=gamedeptype.id, 
+                                                deleted=False).one()
                 return (page, None)
             except NoResultFound:
                 raise GameDepNotFound
         else:
             try:
-                if self.gamedep_type == GAME:
-                    page = DBSession.query(GamesPage).filter_by(
-                                                        name=name).one()
-                    rev = DBSession.query(GamesRevision).filter_by(
-                                                        id=revision).one()    
-                else:
-                    page = DBSession.query(DependenciesPage).filter_by(
-                                                        name=name).one()
-                    rev = DBSession.query(DependenciesRevision).filter_by(
-                                                        id=revision).one()  
+                gamedeptype = self.get_gamedeptype()
+                page = DBSession.query(GameDepPage).filter_by(
+                                                name=name,
+                                                gamedeptype_id=gamedeptype.id, 
+                                                deleted=False).one()
+                rev = DBSession.query(GameDepRevision).filter_by(
+                                                    id=revision).one()
                 if not rev in page.revisions:
                     raise GameDepNotFound
                 

=== modified file 'hypernucleusserver/hypernucleusserver/viewlib/outputlib.py'
--- hypernucleusserver/hypernucleusserver/viewlib/outputlib.py	2011-06-19 17:05:44 +0000
+++ hypernucleusserver/hypernucleusserver/viewlib/outputlib.py	2011-06-21 20:38:13 +0000
@@ -1,7 +1,8 @@
-from hypernucleusserver.models import DBSession, GamesPage, DependenciesPage
-from hypernucleusserver.models import NoResultFound, GamesPicture, Files
-from hypernucleusserver.models import GamesBinary, DependenciesBinary
-from xml.etree.ElementTree import Element, SubElement, ElementTree, tostring
+from hypernucleusserver.models import DBSession
+from sqlalchemy.orm.exc import NoResultFound
+from hypernucleusserver.model.gamedep import GameDepPage, GameDepType
+from hypernucleusserver.model.file import Files
+from xml.etree.ElementTree import Element, SubElement, tostring
 import json
 
 class FileNotFound(Exception):
@@ -62,8 +63,12 @@
         uploadurl = self.uploadurl
         sess = DBSession
         root = Element("hypernucleus")
-        dbgame = sess.query(GamesPage).all()
-        dbdependency = sess.query(DependenciesPage).all()
+        gametype = sess.query(GameDepType).filter_by(name="game").one()
+        deptype = sess.query(GameDepType).filter_by(name="dep").one()
+        dbgame = sess.query(GameDepPage).filter_by(
+                        gamedeptype_id=gametype.id, deleted=False).all()
+        dbdep = sess.query(GameDepPage).filter_by(
+                        gamedeptype_id=deptype.id, deleted=False).all()
         for dbitem in dbgame:
             game = SubElement(root, "game")
             SubElement(game, "name").text = dbitem.display_name
@@ -82,7 +87,7 @@
                 dependency = SubElement(game, "dependency")
                 SubElement(dependency, "modulename").text = dbdepitem.name
                 SubElement(dependency, "version").text = "1" #str(dbdepitem.version)
-        for dbitem in dbdependency:
+        for dbitem in dbdep:
             if countobj(dbitem.revisions) > 0:
                 for binary in dbitem.revisions[0].binary:
                     dependency = SubElement(root, "dependency")
@@ -102,9 +107,12 @@
     
     def show_new_xml(self):
         root = Element("hypernucleus")
-        game = DBSession.query(GamesPage).filter_by(deleted=False).all()
-        dep = DBSession.query(DependenciesPage).filter_by(
-                                                    deleted=False).all()
+        gametype = DBSession.query(GameDepType).filter_by(name="game").one()
+        deptype = DBSession.query(GameDepType).filter_by(name="dep").one()
+        game = DBSession.query(GameDepPage).filter_by(
+                        gamedeptype_id=gametype.id, deleted=False).all()
+        dep = DBSession.query(GameDepPage).filter_by(
+                        gamedeptype_id=deptype.id, deleted=False).all()
         for gamedep in [game, dep]:
             for item in gamedep:
                 if gamedep == game:
@@ -150,9 +158,12 @@
         """
         root = []
         key = None
-        game = DBSession.query(GamesPage).filter_by(deleted=False).all()
-        dep = DBSession.query(DependenciesPage).filter_by(
-                                                    deleted=False).all()
+        gametype = DBSession.query(GameDepType).filter_by(name="game").one()
+        deptype = DBSession.query(GameDepType).filter_by(name="dep").one()
+        game = DBSession.query(GameDepPage).filter_by(
+                        gamedeptype_id=gametype.id, deleted=False).all()
+        dep = DBSession.query(GameDepPage).filter_by(
+                        gamedeptype_id=deptype.id, deleted=False).all()
         for gamedep in [game, dep]:
             if gamedep == game:
                 key = "game"

=== modified file 'hypernucleusserver/hypernucleusserver/viewlib/userlib.py'
--- hypernucleusserver/hypernucleusserver/viewlib/userlib.py	2010-12-11 20:46:28 +0000
+++ hypernucleusserver/hypernucleusserver/viewlib/userlib.py	2011-06-21 20:38:13 +0000
@@ -1,4 +1,6 @@
-from hypernucleusserver.models import DBSession, User, NoResultFound
+from hypernucleusserver.models import DBSession
+from sqlalchemy.orm.exc import NoResultFound
+from hypernucleusserver.model.auth import User
 
 class UserNotFound(Exception):
     pass

=== modified file 'hypernucleusserver/hypernucleusserver/views/errwarninfo.py'
--- hypernucleusserver/hypernucleusserver/views/errwarninfo.py	2010-12-07 23:25:07 +0000
+++ hypernucleusserver/hypernucleusserver/views/errwarninfo.py	2011-06-21 20:38:13 +0000
@@ -1,9 +1,12 @@
 import json
 from pyramid.url import route_url
 from string import Template
-from hypernucleusserver.models import DBSession, ErrWarnInfoInfo, NoResultFound
-from hypernucleusserver.models import ErrWarnInfoError, ErrWarnInfoWarn
+from hypernucleusserver.models import DBSession
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoInfo
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoError
+from hypernucleusserver.model.errwarninfo import ErrWarnInfoWarn
 from pyramid.httpexceptions import HTTPFound
+from sqlalchemy.orm.exc import NoResultFound
 
 notexisterr = u"errwarninfo_notexist"
 jsonerr = u"errwarninfo_json"

=== modified file 'hypernucleusserver/hypernucleusserver/views/gamedep.py'
--- hypernucleusserver/hypernucleusserver/views/gamedep.py	2011-06-17 19:53:18 +0000
+++ hypernucleusserver/hypernucleusserver/views/gamedep.py	2011-06-21 20:38:13 +0000
@@ -1,10 +1,7 @@
 from hypernucleusserver.viewlib.userlib import UserLib
 from hypernucleusserver.viewlib.gamedeplib import GameDepLib, GameDepNotFound
-from hypernucleusserver.viewlib.helpers import error_redirect, get_username
-from pyramid.httpexceptions import HTTPFound, HTTPNotFound
-from pyramid.exceptions import Forbidden, NotFound
-from pyramid.url import route_url
-from pyramid.security import has_permission
+from hypernucleusserver.viewlib.helpers import error_redirect
+from pyramid.exceptions import NotFound
 from colander import MappingSchema, SchemaNode, String, Decimal, OneOf
 from deform import ValidationFailure, Form, FileData
 from deform.widget import TextAreaWidget, TextInputWidget, RadioChoiceWidget, \
@@ -47,12 +44,12 @@
     pageid = request.matchdict.get('pageid')
     
     try:
-        dbpage, dbrevision = g.show(pageid)
+        dbpage = g.show(pageid)[0]
         dbdescription = dbpage.description
         dbname = dbpage.name
         dbdisplay_name = dbpage.display_name
     except GameDepNotFound:
-        dbpage, dbrevision = (None, None)
+        dbpage = None
         dbdescription = u""
         dbname = u""
         dbdisplay_name = u""