You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/02/18 22:42:44 UTC

[3/4] allura git commit: PEP8 cleanup; add license header to test_webhooks.py

http://git-wip-us.apache.org/repos/asf/allura/blob/a3620b4a/Allura/allura/command/create_trove_categories.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/create_trove_categories.py b/Allura/allura/command/create_trove_categories.py
index 2f2fb9f..eba9244 100644
--- a/Allura/allura/command/create_trove_categories.py
+++ b/Allura/allura/command/create_trove_categories.py
@@ -112,9 +112,9 @@ class CreateTroveCategoriesCommand(base.Command):
             (618, 535, "nonprofit", "Non-Profit Organizations",
              "Intended Audience :: by Industry or Sector :: Non-Profit Organizations", False))
         self.create_trove_cat((599, 535, "aerospace", "Aerospace",
-                              "Intended Audience :: by Industry or Sector :: Aerospace", False))
+                               "Intended Audience :: by Industry or Sector :: Aerospace", False))
         self.create_trove_cat((569, 535, "government", "Government",
-                              "Intended Audience :: by Industry or Sector :: Government", False))
+                               "Intended Audience :: by Industry or Sector :: Government", False))
         self.create_trove_cat(
             (363, 535, "informationtechnology", "Information Technology",
              "Intended Audience :: by Industry or Sector :: Information Technology", False))
@@ -125,13 +125,13 @@ class CreateTroveCategoriesCommand(base.Command):
             (362, 535, "healthcareindustry", "Healthcare Industry",
              "Intended Audience :: by Industry or Sector :: Healthcare Industry", False))
         self.create_trove_cat((367, 535, "scienceresearch", "Science/Research",
-                              "Intended Audience :: by Industry or Sector :: Science/Research", False))
+                               "Intended Audience :: by Industry or Sector :: Science/Research", False))
         self.create_trove_cat((359, 535, "customerservice", "Customer Service",
-                              "Intended Audience :: by Industry or Sector :: Customer Service", False))
+                               "Intended Audience :: by Industry or Sector :: Customer Service", False))
         self.create_trove_cat((360, 535, "education", "Education",
-                              "Intended Audience :: by Industry or Sector :: Education", False))
+                               "Intended Audience :: by Industry or Sector :: Education", False))
         self.create_trove_cat((365, 535, "manufacturing", "Manufacturing",
-                              "Intended Audience :: by Industry or Sector :: Manufacturing", False))
+                               "Intended Audience :: by Industry or Sector :: Manufacturing", False))
         self.create_trove_cat(
             (368, 535, "telecommunications", "Telecommunications Industry",
              "Intended Audience :: by Industry or Sector :: Telecommunications Industry", False))
@@ -155,7 +155,7 @@ class CreateTroveCategoriesCommand(base.Command):
             (536, 534, "enduser_advanced", "Advanced End Users",
              "Intended Audience :: by End-User Class :: Advanced End Users", False))
         self.create_trove_cat((4, 534, "sysadmins", "System Administrators",
-                              "Intended Audience :: by End-User Class :: System Administrators", False))
+                               "Intended Audience :: by End-User Class :: System Administrators", False))
         self.create_trove_cat(
             (471, 456, "ui_swing", "Java Swing", "User Interface :: Graphical :: Java Swing", True))
         self.create_trove_cat(
@@ -163,7 +163,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (231, 456, "gnome", "Gnome", "User Interface :: Graphical :: Gnome", True))
         self.create_trove_cat((229, 456, "x11", "X Window System (X11)",
-                              "User Interface :: Graphical :: X Window System (X11)", True))
+                               "User Interface :: Graphical :: X Window System (X11)", True))
         self.create_trove_cat(
             (475, 456, "ui_opengl", "OpenGL", "User Interface :: Graphical :: OpenGL", True))
         self.create_trove_cat(
@@ -173,15 +173,15 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (470, 456, "ui_awt", "Java AWT", "User Interface :: Graphical :: Java AWT", True))
         self.create_trove_cat((230, 456, "win32", "Win32 (MS Windows)",
-                              "User Interface :: Graphical :: Win32 (MS Windows)", True))
+                               "User Interface :: Graphical :: Win32 (MS Windows)", True))
         self.create_trove_cat(
             (232, 456, "kde", "KDE", "User Interface :: Graphical :: KDE", True))
         self.create_trove_cat((310, 456, "cocoa", "Cocoa (MacOS X)",
-                              "User Interface :: Graphical :: Cocoa (MacOS X)", True))
+                               "User Interface :: Graphical :: Cocoa (MacOS X)", True))
         self.create_trove_cat(
             (476, 456, "ui_tabletpc", "TabletPC", "User Interface :: Graphical :: TabletPC", True))
         self.create_trove_cat((314, 456, "handhelds", "Handheld/Mobile/PDA",
-                              "User Interface :: Graphical :: Handheld/Mobile/PDA", True))
+                               "User Interface :: Graphical :: Handheld/Mobile/PDA", True))
         self.create_trove_cat(
             (462, 225, "ui_groupingdesc", "Grouping and Descriptive Categories (UI)",
              "User Interface :: Grouping and Descriptive Categories (UI)", True))
@@ -193,7 +193,8 @@ class CreateTroveCategoriesCommand(base.Command):
              "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a templating system", True))
         self.create_trove_cat(
             (463, 462, "ui_meta_system", "Project is a user interface (UI) system",
-             "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a user interface (UI) system", True))
+             "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a user interface (UI) system",
+             True))
         self.create_trove_cat(
             (465, 462, "ui_meta_windowmanager", "Project is a window manager",
              "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a window manager", True))
@@ -202,15 +203,16 @@ class CreateTroveCategoriesCommand(base.Command):
              "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a graphics toolkit", True))
         self.create_trove_cat(
             (468, 462, "ui_meta_remotecontrol", "Project is a remote control application",
-             "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a remote control application", True))
+             "User Interface :: Grouping and Descriptive Categories (UI) :: Project is a remote control application",
+             True))
         self.create_trove_cat(
             (237, 225, "web", "Web-based", "User Interface :: Web-based", True))
         self.create_trove_cat((238, 225, "daemon", "Non-interactive (Daemon)",
-                              "User Interface :: Non-interactive (Daemon)", True))
+                               "User Interface :: Non-interactive (Daemon)", True))
         self.create_trove_cat(
             (457, 225, "textual_ui", "Textual", "User Interface :: Textual", True))
         self.create_trove_cat((460, 457, "ui_consoleterm", "Console/Terminal",
-                              "User Interface :: Textual :: Console/Terminal", True))
+                               "User Interface :: Textual :: Console/Terminal", True))
         self.create_trove_cat(
             (459, 457, "ui_commandline", "Command-line", "User Interface :: Textual :: Command-line", True))
         self.create_trove_cat(
@@ -222,68 +224,75 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (458, 225, "ui_toolkit", "Toolkits/Libraries", "User Interface :: Toolkits/Libraries", True))
         self.create_trove_cat((495, 458, "ui_othertoolkit", "Other toolkit",
-                              "User Interface :: Toolkits/Libraries :: Other toolkit", True))
+                               "User Interface :: Toolkits/Libraries :: Other toolkit", True))
         self.create_trove_cat((493, 458, "ui_motif", "Motif/LessTif",
-                              "User Interface :: Toolkits/Libraries :: Motif/LessTif", True))
+                               "User Interface :: Toolkits/Libraries :: Motif/LessTif", True))
         self.create_trove_cat((491, 458, "ui_crystalspace", "Crystal Space",
-                              "User Interface :: Toolkits/Libraries :: Crystal Space", True))
+                               "User Interface :: Toolkits/Libraries :: Crystal Space", True))
         self.create_trove_cat((489, 458, "ui_clanlib", "ClanLib",
-                              "User Interface :: Toolkits/Libraries :: ClanLib", True))
+                               "User Interface :: Toolkits/Libraries :: ClanLib", True))
         self.create_trove_cat(
             (516, 500, "db_group_objmap", "Project is a relational object mapper",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a relational object mapper", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a relational object mapper",
+             True))
         self.create_trove_cat(
             (487, 458, "ui_ggi", "GGI", "User Interface :: Toolkits/Libraries :: GGI", True))
         self.create_trove_cat((485, 458, "ui_directx", "DirectX",
-                              "User Interface :: Toolkits/Libraries :: DirectX", True))
+                               "User Interface :: Toolkits/Libraries :: DirectX", True))
         self.create_trove_cat((483, 458, "ui_svgalib", "SVGAlib",
-                              "User Interface :: Toolkits/Libraries :: SVGAlib", True))
+                               "User Interface :: Toolkits/Libraries :: SVGAlib", True))
         self.create_trove_cat((481, 458, "ui_wxwidgets", "wxWidgets",
-                              "User Interface :: Toolkits/Libraries :: wxWidgets", True))
+                               "User Interface :: Toolkits/Libraries :: wxWidgets", True))
         self.create_trove_cat(
             (511, 500, "db_group_mgmt", "Project is a database management tool",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database management tool", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database management tool",
+             True))
         self.create_trove_cat(
             (479, 458, "ui_qt", "Qt", "User Interface :: Toolkits/Libraries :: Qt", True))
         self.create_trove_cat(
             (477, 458, "ui_gtk", "GTK+", "User Interface :: Toolkits/Libraries :: GTK+", True))
         self.create_trove_cat(
             (513, 500, "db_group_netdbms", "Project is a network-based DBMS (database system)",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a network-based DBMS (database system)", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a network-based DBMS (database system)",
+             True))
         self.create_trove_cat(
             (228, 458, "newt", "Newt", "User Interface :: Toolkits/Libraries :: Newt", True))
         self.create_trove_cat((227, 458, "curses", "Curses/Ncurses",
-                              "User Interface :: Toolkits/Libraries :: Curses/Ncurses", True))
+                               "User Interface :: Toolkits/Libraries :: Curses/Ncurses", True))
         self.create_trove_cat(
             (515, 500, "db_group_conv", "Project is a database conversion tool",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database conversion tool", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database conversion tool",
+             True))
         self.create_trove_cat(
             (478, 458, "ui_tk", "Tk", "User Interface :: Toolkits/Libraries :: Tk", True))
         self.create_trove_cat(
             (480, 458, "ui_sdl", "SDL", "User Interface :: Toolkits/Libraries :: SDL", True))
         self.create_trove_cat((33, 28, "postoffice", "Post-Office",
-                              "Topic :: Communications :: Email :: Post-Office", True))
+                               "Topic :: Communications :: Email :: Post-Office", True))
         self.create_trove_cat(
             (514, 500, "db_group_propfmt", "Project is a tool for a proprietary database file format",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a tool for a proprietary database file format", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a tool for a proprietary database file format",
+             True))
         self.create_trove_cat(
             (482, 458, "ui_aalib", "AAlib", "User Interface :: Toolkits/Libraries :: AAlib", True))
         self.create_trove_cat(
             (484, 458, "ui_fltk", "FLTK", "User Interface :: Toolkits/Libraries :: FLTK", True))
         self.create_trove_cat(
             (512, 500, "db_group_filedbms", "Project is a file-based DBMS (database system)",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a file-based DBMS (database system)", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a file-based DBMS (database system)",
+             True))
         self.create_trove_cat(
             (486, 458, "ui_plib", "Plib", "User Interface :: Toolkits/Libraries :: Plib", True))
         self.create_trove_cat(
             (488, 458, "ui_glide", "Glide", "User Interface :: Toolkits/Libraries :: Glide", True))
         self.create_trove_cat(
             (510, 500, "db_group_api", "Project is a database abstraction layer (API)",
-             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database abstraction layer (API)", True))
+             "Database Environment :: Grouping and Descriptive Categories (DB) :: Project is a database abstraction layer (API)",
+             True))
         self.create_trove_cat(
             (490, 458, "ui_glut", "GLUT", "User Interface :: Toolkits/Libraries :: GLUT", True))
         self.create_trove_cat((492, 458, "ui_allegro", "Allegro",
-                              "User Interface :: Toolkits/Libraries :: Allegro", True))
+                               "User Interface :: Toolkits/Libraries :: Allegro", True))
         self.create_trove_cat(
             (500, 496, "db_grouping", "Grouping and Descriptive Categories (DB)",
              "Database Environment :: Grouping and Descriptive Categories (DB)", True))
@@ -294,12 +303,12 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (276, 274, "french", "French", "Translations :: French", True))
         self.create_trove_cat((473, 456, "ui_carbon", "Carbon (Mac OS X)",
-                              "User Interface :: Graphical :: Carbon (Mac OS X)", True))
+                               "User Interface :: Graphical :: Carbon (Mac OS X)", True))
         self.create_trove_cat(
             (535, 1, "by_industrysector", "by Industry or Sector",
              "Intended Audience :: by Industry or Sector", False))
         self.create_trove_cat((364, 535, "legalindustry", "Legal Industry",
-                              "Intended Audience :: by Industry or Sector :: Legal Industry", False))
+                               "Intended Audience :: by Industry or Sector :: Legal Industry", False))
         self.create_trove_cat(
             (353, 274, "ukrainian", "Ukrainian", "Translations :: Ukrainian", True))
         self.create_trove_cat(
@@ -339,11 +348,11 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (186, 160, "visualbasic", "Visual Basic", "Programming Language :: Visual Basic", True))
         self.create_trove_cat((505, 499, "db_pear", "PHP Pear::DB",
-                              "Database Environment :: Database API :: PHP Pear::DB", True))
+                               "Database Environment :: Database API :: PHP Pear::DB", True))
         self.create_trove_cat((507, 499, "db_api_xml", "XML-based",
-                              "Database Environment :: Database API :: XML-based", True))
+                               "Database Environment :: Database API :: XML-based", True))
         self.create_trove_cat((509, 499, "db_api_other", "Other API",
-                              "Database Environment :: Database API :: Other API", True))
+                               "Database Environment :: Database API :: Other API", True))
         self.create_trove_cat(
             (532, 497, "db_net_hsql", "HSQL", "Database Environment :: Network-based DBMS :: HSQL", True))
         self.create_trove_cat(
@@ -375,23 +384,23 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (502, 499, "db_api_jdbc", "JDBC", "Database Environment :: Database API :: JDBC", True))
         self.create_trove_cat((504, 499, "db_api_perldbi", "Perl DBI/DBD",
-                              "Database Environment :: Database API :: Perl DBI/DBD", True))
+                               "Database Environment :: Database API :: Perl DBI/DBD", True))
         self.create_trove_cat(
             (274, 0, "natlanguage", "Translations", "Translations", True))
         self.create_trove_cat((506, 499, "db_python", "Python Database API",
-                              "Database Environment :: Database API :: Python Database API", True))
+                               "Database Environment :: Database API :: Python Database API", True))
         self.create_trove_cat((526, 497, "db_net_oracle", "Oracle",
-                              "Database Environment :: Network-based DBMS :: Oracle", True))
+                               "Database Environment :: Network-based DBMS :: Oracle", True))
         self.create_trove_cat((524, 497, "db_net_mysql", "MySQL",
-                              "Database Environment :: Network-based DBMS :: MySQL", True))
+                               "Database Environment :: Network-based DBMS :: MySQL", True))
         self.create_trove_cat((525, 497, "db_net_pgsql", "PostgreSQL (pgsql)",
-                              "Database Environment :: Network-based DBMS :: PostgreSQL (pgsql)", True))
+                               "Database Environment :: Network-based DBMS :: PostgreSQL (pgsql)", True))
         self.create_trove_cat((527, 497, "db_net_ibmdb2", "IBM DB2",
-                              "Database Environment :: Network-based DBMS :: IBM DB2", True))
+                               "Database Environment :: Network-based DBMS :: IBM DB2", True))
         self.create_trove_cat((529, 497, "db_net_sybase", "Sybase",
-                              "Database Environment :: Network-based DBMS :: Sybase", True))
+                               "Database Environment :: Network-based DBMS :: Sybase", True))
         self.create_trove_cat((531, 497, "db_net_sqlite", "SQLite",
-                              "Database Environment :: Network-based DBMS :: SQLite", True))
+                               "Database Environment :: Network-based DBMS :: SQLite", True))
         self.create_trove_cat(
             (533, 497, "db_net_other", "Other network-based DBMS",
              "Database Environment :: Network-based DBMS :: Other network-based DBMS", True))
@@ -402,7 +411,7 @@ class CreateTroveCategoriesCommand(base.Command):
             (426, 199, "os_emu_api", "Emulation and API Compatibility",
              "Operating System :: Emulation and API Compatibility", True))
         self.create_trove_cat((311, 236, "macos9", "Apple Mac OS Classic",
-                              "Operating System :: Other Operating Systems :: Apple Mac OS Classic", True))
+                               "Operating System :: Other Operating Systems :: Apple Mac OS Classic", True))
         self.create_trove_cat(
             (224, 236, "beos", "BeOS", "Operating System :: Other Operating Systems :: BeOS", True))
         self.create_trove_cat(
@@ -410,7 +419,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (421, 236, "mswin_95", "Win95", "Operating System :: Other Operating Systems :: Win95", True))
         self.create_trove_cat((508, 499, "db_api_sql", "SQL-based",
-                              "Database Environment :: Database API :: SQL-based", True))
+                               "Database Environment :: Database API :: SQL-based", True))
         self.create_trove_cat(
             (499, 496, "db_api", "Database API", "Database Environment :: Database API", True))
         self.create_trove_cat(
@@ -432,29 +441,29 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (29, 28, "filters", "Filters", "Topic :: Communications :: Email :: Filters", True))
         self.create_trove_cat((30, 28, "listservers", "Mailing List Servers",
-                              "Topic :: Communications :: Email :: Mailing List Servers", True))
+                               "Topic :: Communications :: Email :: Mailing List Servers", True))
         self.create_trove_cat(
             (597, 80, "card_games", "Card Games", "Topic :: Games/Entertainment :: Card Games", True))
         self.create_trove_cat(
             (63, 18, "editors", "Text Editors", "Topic :: Text Editors", True))
         self.create_trove_cat((366, 535, "religion", "Religion",
-                              "Intended Audience :: by Industry or Sector :: Religion", False))
+                               "Intended Audience :: by Industry or Sector :: Religion", False))
         self.create_trove_cat(
             (534, 1, "by_enduser", "by End-User Class", "Intended Audience :: by End-User Class", False))
         self.create_trove_cat(
             (528, 497, "db_net_firebird", "Firebird/InterBase",
              "Database Environment :: Network-based DBMS :: Firebird/InterBase", True))
         self.create_trove_cat((3, 534, "developers", "Developers",
-                              "Intended Audience :: by End-User Class :: Developers", False))
+                               "Intended Audience :: by End-User Class :: Developers", False))
         self.create_trove_cat(
             (530, 497, "db_net_mssql", "Microsoft SQL Server",
              "Database Environment :: Network-based DBMS :: Microsoft SQL Server", True))
         self.create_trove_cat((2, 534, "endusers", "End Users/Desktop",
-                              "Intended Audience :: by End-User Class :: End Users/Desktop", False))
+                               "Intended Audience :: by End-User Class :: End Users/Desktop", False))
         self.create_trove_cat(
             (498, 496, "db_filebased", "File-based DBMS", "Database Environment :: File-based DBMS", True))
         self.create_trove_cat((537, 534, "enduser_qa", "Quality Engineers",
-                              "Intended Audience :: by End-User Class :: Quality Engineers", False))
+                               "Intended Audience :: by End-User Class :: Quality Engineers", False))
         self.create_trove_cat(
             (5, 1, "other", "Other Audience", "Intended Audience :: Other Audience", False))
         self.create_trove_cat(
@@ -463,7 +472,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (358, 6, "inactive", "7 - Inactive", "Development Status :: 7 - Inactive", False))
         self.create_trove_cat((520, 498, "db_file_palm", "PalmOS PDB",
-                              "Database Environment :: File-based DBMS :: PalmOS PDB", True))
+                               "Database Environment :: File-based DBMS :: PalmOS PDB", True))
         self.create_trove_cat(
             (523, 498, "db_file_other", "Other file-based DBMS",
              "Database Environment :: File-based DBMS :: Other file-based DBMS", True))
@@ -502,7 +511,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (174, 160, "objectivec", "Objective C", "Programming Language :: Objective C", True))
         self.create_trove_cat((560, 160, "xsl", "XSL (XSLT/XPath/XSL-FO)",
-                              "Programming Language :: XSL (XSLT/XPath/XSL-FO)", True))
+                               "Programming Language :: XSL (XSLT/XPath/XSL-FO)", True))
         self.create_trove_cat(
             (293, 160, "ruby", "Ruby", "Programming Language :: Ruby", True))
         self.create_trove_cat(
@@ -510,7 +519,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (281, 160, "REBOL", "REBOL", "Programming Language :: REBOL", True))
         self.create_trove_cat((454, 160, "ocaml", "OCaml (Objective Caml)",
-                              "Programming Language :: OCaml (Objective Caml)", True))
+                               "Programming Language :: OCaml (Objective Caml)", True))
         self.create_trove_cat(
             (453, 160, "vb_net", "Visual Basic .NET", "Programming Language :: Visual Basic .NET", True))
         self.create_trove_cat(
@@ -588,13 +597,13 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (336, 274, "indonesian", "Indonesian", "Translations :: Indonesian", True))
         self.create_trove_cat((521, 498, "db_file_flat", "Flat-file",
-                              "Database Environment :: File-based DBMS :: Flat-file", True))
+                               "Database Environment :: File-based DBMS :: Flat-file", True))
         self.create_trove_cat((519, 498, "db_file_xbase", "xBase",
-                              "Database Environment :: File-based DBMS :: xBase", True))
+                               "Database Environment :: File-based DBMS :: xBase", True))
         self.create_trove_cat(
             (338, 274, "javanese", "Javanese", "Translations :: Javanese", True))
         self.create_trove_cat((518, 498, "db_msaccess", "Microsoft Access",
-                              "Database Environment :: File-based DBMS :: Microsoft Access", True))
+                               "Database Environment :: File-based DBMS :: Microsoft Access", True))
         self.create_trove_cat(
             (522, 498, "db_file_proprietary", "Proprietary file format",
              "Database Environment :: File-based DBMS :: Proprietary file format", True))
@@ -627,7 +636,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (277, 274, "spanish", "Spanish", "Translations :: Spanish", True))
         self.create_trove_cat((11, 6, "production", "5 - Production/Stable",
-                              "Development Status :: 5 - Production/Stable", False))
+                               "Development Status :: 5 - Production/Stable", False))
         self.create_trove_cat(
             (10, 6, "beta", "4 - Beta", "Development Status :: 4 - Beta", False))
         self.create_trove_cat(
@@ -646,9 +655,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (14, 13, "osi", "OSI-Approved Open Source", "License :: OSI-Approved Open Source", False))
         self.create_trove_cat((388, 14, "osl", "Open Software License",
-                              "License :: OSI-Approved Open Source :: Open Software License", False))
+                               "License :: OSI-Approved Open Source :: Open Software License", False))
         self.create_trove_cat((321, 14, "motosoto", "Motosoto License",
-                              "License :: OSI-Approved Open Source :: Motosoto License", False))
+                               "License :: OSI-Approved Open Source :: Motosoto License", False))
         self.create_trove_cat(
             (325, 14, "attribut", "Attribution Assurance License",
              "License :: OSI-Approved Open Source :: Attribution Assurance License", False))
@@ -667,18 +676,18 @@ class CreateTroveCategoriesCommand(base.Command):
             (395, 14, "real", "RealNetworks Public Source License V1.0",
              "License :: OSI-Approved Open Source :: RealNetworks Public Source License V1.0", False))
         self.create_trove_cat((396, 14, "rpl", "Reciprocal Public License",
-                              "License :: OSI-Approved Open Source :: Reciprocal Public License", False))
+                               "License :: OSI-Approved Open Source :: Reciprocal Public License", False))
         self.create_trove_cat((392, 14, "eiffel2", "Eiffel Forum License V2.0",
-                              "License :: OSI-Approved Open Source :: Eiffel Forum License V2.0", False))
+                               "License :: OSI-Approved Open Source :: Eiffel Forum License V2.0", False))
         self.create_trove_cat(
             (320, 14, "w3c", "W3C License", "License :: OSI-Approved Open Source :: W3C License", False))
         self.create_trove_cat((400, 14, "frameworx", "Frameworx Open License",
-                              "License :: OSI-Approved Open Source :: Frameworx Open License", False))
+                               "License :: OSI-Approved Open Source :: Frameworx Open License", False))
         self.create_trove_cat(
             (194, 14, "python", "Python License (CNRI Python License)",
              "License :: OSI-Approved Open Source :: Python License (CNRI Python License)", False))
         self.create_trove_cat((296, 14, "apache", "Apache Software License",
-                              "License :: OSI-Approved Open Source :: Apache Software License", False))
+                               "License :: OSI-Approved Open Source :: Apache Software License", False))
         self.create_trove_cat(
             (298, 14, "sissl", "Sun Industry Standards Source License (SISSL)",
              "License :: OSI-Approved Open Source :: Sun Industry Standards Source License (SISSL)", False))
@@ -687,13 +696,13 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (197, 13, "publicdomain", "Public Domain", "License :: Public Domain", False))
         self.create_trove_cat((301, 14, "nokia", "Nokia Open Source License",
-                              "License :: OSI-Approved Open Source :: Nokia Open Source License", False))
+                               "License :: OSI-Approved Open Source :: Nokia Open Source License", False))
         self.create_trove_cat((319, 14, "eiffel", "Eiffel Forum License",
-                              "License :: OSI-Approved Open Source :: Eiffel Forum License", False))
+                               "License :: OSI-Approved Open Source :: Eiffel Forum License", False))
         self.create_trove_cat((318, 14, "sunpublic", "Sun Public License",
-                              "License :: OSI-Approved Open Source :: Sun Public License", False))
+                               "License :: OSI-Approved Open Source :: Sun Public License", False))
         self.create_trove_cat((190, 14, "qpl", "Qt Public License (QPL)",
-                              "License :: OSI-Approved Open Source :: Qt Public License (QPL)", False))
+                               "License :: OSI-Approved Open Source :: Qt Public License (QPL)", False))
         self.create_trove_cat(
             (390, 14, "oclc", "OCLC Research Public License 2.0",
              "License :: OSI-Approved Open Source :: OCLC Research Public License 2.0", False))
@@ -707,12 +716,12 @@ class CreateTroveCategoriesCommand(base.Command):
             (316, 14, "opengroup", "Open Group Test Suite License",
              "License :: OSI-Approved Open Source :: Open Group Test Suite License", False))
         self.create_trove_cat((300, 14, "jabber", "Jabber Open Source License",
-                              "License :: OSI-Approved Open Source :: Jabber Open Source License", False))
+                               "License :: OSI-Approved Open Source :: Jabber Open Source License", False))
         self.create_trove_cat(
             (297, 14, "vovida", "Vovida Software License 1.0",
              "License :: OSI-Approved Open Source :: Vovida Software License 1.0", False))
         self.create_trove_cat((324, 14, "afl", "Academic Free License (AFL)",
-                              "License :: OSI-Approved Open Source :: Academic Free License (AFL)", False))
+                               "License :: OSI-Approved Open Source :: Academic Free License (AFL)", False))
         self.create_trove_cat(
             (189, 14, "psfl", "Python Software Foundation License",
              "License :: OSI-Approved Open Source :: Python Software Foundation License", False))
@@ -720,7 +729,7 @@ class CreateTroveCategoriesCommand(base.Command):
             (193, 14, "rscpl", "Ricoh Source Code Public License",
              "License :: OSI-Approved Open Source :: Ricoh Source Code Public License", False))
         self.create_trove_cat((17, 14, "artistic", "Artistic License",
-                              "License :: OSI-Approved Open Source :: Artistic License", False))
+                               "License :: OSI-Approved Open Source :: Artistic License", False))
         self.create_trove_cat(
             (389, 14, "sybase", "Sybase Open Watcom Public License",
              "License :: OSI-Approved Open Source :: Sybase Open Watcom Public License", False))
@@ -728,7 +737,7 @@ class CreateTroveCategoriesCommand(base.Command):
             (391, 14, "wxwindows", "wxWindows Library Licence",
              "License :: OSI-Approved Open Source :: wxWindows Library Licence", False))
         self.create_trove_cat((397, 14, "entessa", "Entessa Public License",
-                              "License :: OSI-Approved Open Source :: Entessa Public License", False))
+                               "License :: OSI-Approved Open Source :: Entessa Public License", False))
         self.create_trove_cat(
             (16, 14, "lgpl", "GNU Library or Lesser General Public License (LGPL)",
              "License :: OSI-Approved Open Source :: GNU Library or Lesser General Public License (LGPL)", False))
@@ -739,14 +748,14 @@ class CreateTroveCategoriesCommand(base.Command):
             (15, 14, "gpl", "GNU General Public License (GPL)",
              "License :: OSI-Approved Open Source :: GNU General Public License (GPL)", False))
         self.create_trove_cat((191, 14, "ibm", "IBM Public License",
-                              "License :: OSI-Approved Open Source :: IBM Public License", False))
+                               "License :: OSI-Approved Open Source :: IBM Public License", False))
         self.create_trove_cat(
             (192, 14, "cvw", "MITRE Collaborative Virtual Workspace License (CVW)",
              "License :: OSI-Approved Open Source :: MITRE Collaborative Virtual Workspace License (CVW)", False))
         self.create_trove_cat((299, 14, "iosl", "Intel Open Source License",
-                              "License :: OSI-Approved Open Source :: Intel Open Source License", False))
+                               "License :: OSI-Approved Open Source :: Intel Open Source License", False))
         self.create_trove_cat((399, 14, "php-license", "PHP License",
-                              "License :: OSI-Approved Open Source :: PHP License", False))
+                               "License :: OSI-Approved Open Source :: PHP License", False))
         self.create_trove_cat(
             (188, 14, "mit", "MIT License", "License :: OSI-Approved Open Source :: MIT License", False))
         self.create_trove_cat(
@@ -758,35 +767,35 @@ class CreateTroveCategoriesCommand(base.Command):
             (403, 14, "datagrid", "EU DataGrid Software License",
              "License :: OSI-Approved Open Source :: EU DataGrid Software License", False))
         self.create_trove_cat((307, 14, "ibmcpl", "Common Public License",
-                              "License :: OSI-Approved Open Source :: Common Public License", False))
+                               "License :: OSI-Approved Open Source :: Common Public License", False))
         self.create_trove_cat(
             (402, 14, "cua", "CUA Office Public License Version 1.0",
              "License :: OSI-Approved Open Source :: CUA Office Public License Version 1.0", False))
         self.create_trove_cat((401, 14, "apache2", "Apache License V2.0",
-                              "License :: OSI-Approved Open Source :: Apache License V2.0", False))
+                               "License :: OSI-Approved Open Source :: Apache License V2.0", False))
         self.create_trove_cat((394, 14, "nausite", "Naumen Public License",
-                              "License :: OSI-Approved Open Source :: Naumen Public License", False))
+                               "License :: OSI-Approved Open Source :: Naumen Public License", False))
         self.create_trove_cat((317, 14, "xnet", "X.Net License",
-                              "License :: OSI-Approved Open Source :: X.Net License", False))
+                               "License :: OSI-Approved Open Source :: X.Net License", False))
         self.create_trove_cat((195, 14, "zlib", "zlib/libpng License",
-                              "License :: OSI-Approved Open Source :: zlib/libpng License", False))
+                               "License :: OSI-Approved Open Source :: zlib/libpng License", False))
         self.create_trove_cat(
             (323, 14, "ncsa", "University of Illinois/NCSA Open Source License",
              "License :: OSI-Approved Open Source :: University of Illinois/NCSA Open Source License", False))
         self.create_trove_cat((322, 14, "zope", "Zope Public License",
-                              "License :: OSI-Approved Open Source :: Zope Public License", False))
+                               "License :: OSI-Approved Open Source :: Zope Public License", False))
         self.create_trove_cat((302, 14, "sleepycat", "Sleepycat License",
-                              "License :: OSI-Approved Open Source :: Sleepycat License", False))
+                               "License :: OSI-Approved Open Source :: Sleepycat License", False))
         self.create_trove_cat(
             (303, 14, "nethack", "Nethack General Public License",
              "License :: OSI-Approved Open Source :: Nethack General Public License", False))
         self.create_trove_cat((306, 14, "apsl", "Apple Public Source License",
-                              "License :: OSI-Approved Open Source :: Apple Public Source License", False))
+                               "License :: OSI-Approved Open Source :: Apple Public Source License", False))
         self.create_trove_cat(
             (305, 14, "mpl11", "Mozilla Public License 1.1 (MPL 1.1)",
              "License :: OSI-Approved Open Source :: Mozilla Public License 1.1 (MPL 1.1)", False))
         self.create_trove_cat((628, 14, "adaptive", "Adaptive Public License",
-                              "License :: OSI-Approved Open Source :: Adaptive Public License", False))
+                               "License :: OSI-Approved Open Source :: Adaptive Public License", False))
         self.create_trove_cat(
             (630, 14, "cddl", "Common Development and Distribution License",
              "License :: OSI-Approved Open Source :: Common Development and Distribution License", False))
@@ -796,15 +805,15 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (199, 0, "os", "Operating System", "Operating System", True))
         self.create_trove_cat((429, 426, "fink", "Fink (Mac OS X)",
-                              "Operating System :: Emulation and API Compatibility :: Fink (Mac OS X)", True))
+                               "Operating System :: Emulation and API Compatibility :: Fink (Mac OS X)", True))
         self.create_trove_cat((427, 426, "cygwin", "Cygwin (MS Windows)",
-                              "Operating System :: Emulation and API Compatibility :: Cygwin (MS Windows)", True))
+                               "Operating System :: Emulation and API Compatibility :: Cygwin (MS Windows)", True))
         self.create_trove_cat(
             (428, 426, "dosemu", "DOSEMU", "Operating System :: Emulation and API Compatibility :: DOSEMU", True))
         self.create_trove_cat(
             (430, 426, "wine", "WINE", "Operating System :: Emulation and API Compatibility :: WINE", True))
         self.create_trove_cat((431, 426, "emx", "EMX (OS/2 and MS-DOS)",
-                              "Operating System :: Emulation and API Compatibility :: EMX (OS/2 and MS-DOS)", True))
+                               "Operating System :: Emulation and API Compatibility :: EMX (OS/2 and MS-DOS)", True))
         self.create_trove_cat(
             (445, 426, "mingw_msys", "MinGW/MSYS (MS Windows)",
              "Operating System :: Emulation and API Compatibility :: MinGW/MSYS (MS Windows)", True))
@@ -818,49 +827,62 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (441, 315, "ecos", "eCos", "Operating System :: Handheld/Embedded Operating Systems :: eCos", True))
         self.create_trove_cat(
-            (443, 315, "vxworks", "VxWorks", "Operating System :: Handheld/Embedded Operating Systems :: VxWorks", True))
+            (
+            443, 315, "vxworks", "VxWorks", "Operating System :: Handheld/Embedded Operating Systems :: VxWorks", True))
         self.create_trove_cat((444, 315, "symbianos", "SymbianOS",
-                              "Operating System :: Handheld/Embedded Operating Systems :: SymbianOS", True))
+                               "Operating System :: Handheld/Embedded Operating Systems :: SymbianOS", True))
         self.create_trove_cat(
             (442, 315, "qnx", "QNX", "Operating System :: Handheld/Embedded Operating Systems :: QNX", True))
         self.create_trove_cat(
-            (440, 315, "uclinux", "uClinux", "Operating System :: Handheld/Embedded Operating Systems :: uClinux", True))
+            (
+            440, 315, "uclinux", "uClinux", "Operating System :: Handheld/Embedded Operating Systems :: uClinux", True))
         self.create_trove_cat(
             (418, 199, "modern_oses", "Modern (Vendor-Supported) Desktop Operating Systems",
              "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems", True))
         self.create_trove_cat((420, 418, "mswin_2000", "Win2K",
-                              "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Win2K", True))
+                               "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Win2K",
+                               True))
         self.create_trove_cat(
-            (207, 418, "sun", "Solaris", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Solaris", True))
+            (207, 418, "sun", "Solaris",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Solaris", True))
         self.create_trove_cat(
-            (201, 418, "linux", "Linux", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Linux", True))
+            (201, 418, "linux", "Linux",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Linux", True))
         self.create_trove_cat((205, 418, "openbsd", "OpenBSD",
-                              "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: OpenBSD", True))
+                               "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: OpenBSD",
+                               True))
         self.create_trove_cat((203, 418, "freebsd", "FreeBSD",
-                              "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: FreeBSD", True))
+                               "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: FreeBSD",
+                               True))
         self.create_trove_cat(
-            (204, 418, "netbsd", "NetBSD", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: NetBSD", True))
+            (204, 418, "netbsd", "NetBSD",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: NetBSD", True))
         self.create_trove_cat(
-            (309, 418, "macosx", "OS X", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: OS X", True))
+            (309, 418, "macosx", "OS X",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: OS X", True))
         self.create_trove_cat(
-            (419, 418, "mswin_xp", "WinXP", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: WinXP", True))
+            (419, 418, "mswin_xp", "WinXP",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: WinXP", True))
         self.create_trove_cat((236, 199, "other", "Other Operating Systems",
-                              "Operating System :: Other Operating Systems", True))
+                               "Operating System :: Other Operating Systems", True))
         self.create_trove_cat(
             (206, 236, "bsdos", "BSD/OS", "Operating System :: Other Operating Systems :: BSD/OS", True))
         self.create_trove_cat(
             (634, 236, "console-platforms", "Console-based Platforms",
              "Operating System :: Other Operating Systems :: Console-based Platforms", True))
         self.create_trove_cat((637, 634, "sega-dreamcast", "Sega Dreamcast",
-                              "Operating System :: Other Operating Systems :: Console-based Platforms :: Sega Dreamcast", True))
+                               "Operating System :: Other Operating Systems :: Console-based Platforms :: Sega Dreamcast",
+                               True))
         self.create_trove_cat((635, 634, "xbox", "Microsoft Xbox",
-                              "Operating System :: Other Operating Systems :: Console-based Platforms :: Microsoft Xbox", True))
+                               "Operating System :: Other Operating Systems :: Console-based Platforms :: Microsoft Xbox",
+                               True))
         self.create_trove_cat((636, 634, "sony-ps2", "Sony Playstation 2",
-                              "Operating System :: Other Operating Systems :: Console-based Platforms :: Sony Playstation 2", True))
+                               "Operating System :: Other Operating Systems :: Console-based Platforms :: Sony Playstation 2",
+                               True))
         self.create_trove_cat(
             (422, 236, "mswin_98", "Win98", "Operating System :: Other Operating Systems :: Win98", True))
         self.create_trove_cat((425, 422, "mswin_98_osr2", "Win98 OSR2",
-                              "Operating System :: Other Operating Systems :: Win98 :: Win98 OSR2", True))
+                               "Operating System :: Other Operating Systems :: Win98 :: Win98 OSR2", True))
         self.create_trove_cat(
             (424, 236, "mswin_me", "WinME", "Operating System :: Other Operating Systems :: WinME", True))
         self.create_trove_cat(
@@ -889,27 +911,32 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (240, 236, "gnuhurd", "GNU Hurd", "Operating System :: Other Operating Systems :: GNU Hurd", True))
         self.create_trove_cat((217, 236, "win31", "Microsoft Windows 3.x",
-                              "Operating System :: Other Operating Systems :: Microsoft Windows 3.x", True))
+                               "Operating System :: Other Operating Systems :: Microsoft Windows 3.x", True))
         self.create_trove_cat(
             (432, 199, "os_groups", "Grouping and Descriptive Categories",
              "Operating System :: Grouping and Descriptive Categories", True))
         self.create_trove_cat((218, 432, "win95", "32-bit MS Windows (95/98)",
-                              "Operating System :: Grouping and Descriptive Categories :: 32-bit MS Windows (95/98)", True))
+                               "Operating System :: Grouping and Descriptive Categories :: 32-bit MS Windows (95/98)",
+                               True))
         self.create_trove_cat(
             (439, 432, "os_projectdistrospecific", "Project is OS Distribution-Specific",
              "Operating System :: Grouping and Descriptive Categories :: Project is OS Distribution-Specific", True))
         self.create_trove_cat(
             (449, 432, "eightbit_oses", "Classic 8-bit Operating Systems (Apple, Atari, Commodore, etc.)",
-             "Operating System :: Grouping and Descriptive Categories :: Classic 8-bit Operating Systems (Apple, Atari, Commodore, etc.)", True))
+             "Operating System :: Grouping and Descriptive Categories :: Classic 8-bit Operating Systems (Apple, Atari, Commodore, etc.)",
+             True))
         self.create_trove_cat(
             (436, 432, "os_portable", "OS Portable (Source code to work with many OS platforms)",
-             "Operating System :: Grouping and Descriptive Categories :: OS Portable (Source code to work with many OS platforms)", True))
+             "Operating System :: Grouping and Descriptive Categories :: OS Portable (Source code to work with many OS platforms)",
+             True))
         self.create_trove_cat(
             (438, 432, "os_projectdistro", "Project is an Operating System Distribution",
-             "Operating System :: Grouping and Descriptive Categories :: Project is an Operating System Distribution", True))
+             "Operating System :: Grouping and Descriptive Categories :: Project is an Operating System Distribution",
+             True))
         self.create_trove_cat(
             (235, 432, "independent", "OS Independent (Written in an interpreted language)",
-             "Operating System :: Grouping and Descriptive Categories :: OS Independent (Written in an interpreted language)", True))
+             "Operating System :: Grouping and Descriptive Categories :: OS Independent (Written in an interpreted language)",
+             True))
         self.create_trove_cat(
             (200, 432, "posix", "All POSIX (Linux/BSD/UNIX-like OSes)",
              "Operating System :: Grouping and Descriptive Categories :: All POSIX (Linux/BSD/UNIX-like OSes)", True))
@@ -918,10 +945,12 @@ class CreateTroveCategoriesCommand(base.Command):
              "Operating System :: Grouping and Descriptive Categories :: 32-bit MS Windows (NT/2000/XP)", True))
         self.create_trove_cat(
             (202, 432, "bsd", "All BSD Platforms (FreeBSD/NetBSD/OpenBSD/Apple Mac OS X)",
-             "Operating System :: Grouping and Descriptive Categories :: All BSD Platforms (FreeBSD/NetBSD/OpenBSD/Apple Mac OS X)", True))
+             "Operating System :: Grouping and Descriptive Categories :: All BSD Platforms (FreeBSD/NetBSD/OpenBSD/Apple Mac OS X)",
+             True))
         self.create_trove_cat(
             (435, 432, "mswin_all32bit", "All 32-bit MS Windows (95/98/NT/2000/XP)",
-             "Operating System :: Grouping and Descriptive Categories :: All 32-bit MS Windows (95/98/NT/2000/XP)", True))
+             "Operating System :: Grouping and Descriptive Categories :: All 32-bit MS Windows (95/98/NT/2000/XP)",
+             True))
         self.create_trove_cat(
             (437, 432, "os_projectkernel", "Project is an Operating System Kernel",
              "Operating System :: Grouping and Descriptive Categories :: Project is an Operating System Kernel", True))
@@ -937,9 +966,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (285, 63, "textprocessing", "Text Processing", "Topic :: Text Editors :: Text Processing", True))
         self.create_trove_cat((611, 18, "formats_and_protocols",
-                              "Formats and Protocols", "Topic :: Formats and Protocols", True))
+                               "Formats and Protocols", "Topic :: Formats and Protocols", True))
         self.create_trove_cat((554, 611, "data_formats", "Data Formats",
-                              "Topic :: Formats and Protocols :: Data Formats", True))
+                               "Topic :: Formats and Protocols :: Data Formats", True))
         self.create_trove_cat(
             (559, 554, "xml", "XML", "Topic :: Formats and Protocols :: Data Formats :: XML", True))
         self.create_trove_cat(
@@ -947,9 +976,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (555, 554, "docbook", "DocBook", "Topic :: Formats and Protocols :: Data Formats :: DocBook", True))
         self.create_trove_cat((556, 554, "html_xhtml", "HTML/XHTML",
-                              "Topic :: Formats and Protocols :: Data Formats :: HTML/XHTML", True))
+                               "Topic :: Formats and Protocols :: Data Formats :: HTML/XHTML", True))
         self.create_trove_cat((558, 554, "tex_latex", "TeX/LaTeX",
-                              "Topic :: Formats and Protocols :: Data Formats :: TeX/LaTeX", True))
+                               "Topic :: Formats and Protocols :: Data Formats :: TeX/LaTeX", True))
         self.create_trove_cat(
             (612, 611, "protocols", "Protocols", "Topic :: Formats and Protocols :: Protocols", True))
         self.create_trove_cat(
@@ -984,11 +1013,11 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (22, 20, "chat", "Chat", "Topic :: Communications :: Chat", True))
         self.create_trove_cat((574, 22, "msn_messenger", "MSN Messenger",
-                              "Topic :: Communications :: Chat :: MSN Messenger", True))
+                               "Topic :: Communications :: Chat :: MSN Messenger", True))
         self.create_trove_cat((26, 22, "aim", "AOL Instant Messenger",
-                              "Topic :: Communications :: Chat :: AOL Instant Messenger", True))
+                               "Topic :: Communications :: Chat :: AOL Instant Messenger", True))
         self.create_trove_cat((24, 22, "irc", "Internet Relay Chat",
-                              "Topic :: Communications :: Chat :: Internet Relay Chat", True))
+                               "Topic :: Communications :: Chat :: Internet Relay Chat", True))
         self.create_trove_cat(
             (25, 22, "talk", "Unix Talk", "Topic :: Communications :: Chat :: Unix Talk", True))
         self.create_trove_cat(
@@ -1002,7 +1031,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (251, 20, "filesharing", "File Sharing", "Topic :: Communications :: File Sharing", True))
         self.create_trove_cat((622, 251, "bittorrent", "BitTorrent",
-                              "Topic :: Communications :: File Sharing :: BitTorrent", True))
+                               "Topic :: Communications :: File Sharing :: BitTorrent", True))
         self.create_trove_cat(
             (286, 251, "gnutella", "Gnutella", "Topic :: Communications :: File Sharing :: Gnutella", True))
         self.create_trove_cat(
@@ -1012,9 +1041,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (28, 20, "email", "Email", "Topic :: Communications :: Email", True))
         self.create_trove_cat((31, 28, "mua", "Email Clients (MUA)",
-                              "Topic :: Communications :: Email :: Email Clients (MUA)", True))
+                               "Topic :: Communications :: Email :: Email Clients (MUA)", True))
         self.create_trove_cat((32, 28, "mta", "Mail Transport Agents",
-                              "Topic :: Communications :: Email :: Mail Transport Agents", True))
+                               "Topic :: Communications :: Email :: Mail Transport Agents", True))
         self.create_trove_cat(
             (234, 18, "other", "Other/Nonlisted Topic", "Topic :: Other/Nonlisted Topic", True))
         self.create_trove_cat(
@@ -1035,13 +1064,13 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (75, 129, "financial", "Financial", "Topic :: Office/Business :: Financial", True))
         self.create_trove_cat((76, 75, "accounting", "Accounting",
-                              "Topic :: Office/Business :: Financial :: Accounting", True))
+                               "Topic :: Office/Business :: Financial :: Accounting", True))
         self.create_trove_cat((77, 75, "investment", "Investment",
-                              "Topic :: Office/Business :: Financial :: Investment", True))
+                               "Topic :: Office/Business :: Financial :: Investment", True))
         self.create_trove_cat((78, 75, "spreadsheet", "Spreadsheet",
-                              "Topic :: Office/Business :: Financial :: Spreadsheet", True))
+                               "Topic :: Office/Business :: Financial :: Spreadsheet", True))
         self.create_trove_cat((79, 75, "pointofsale", "Point-Of-Sale",
-                              "Topic :: Office/Business :: Financial :: Point-Of-Sale", True))
+                               "Topic :: Office/Business :: Financial :: Point-Of-Sale", True))
         self.create_trove_cat(
             (130, 129, "scheduling", "Scheduling", "Topic :: Office/Business :: Scheduling", True))
         self.create_trove_cat(
@@ -1061,7 +1090,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (68, 66, "frontends", "Front-Ends", "Topic :: Database :: Front-Ends", True))
         self.create_trove_cat((67, 66, "engines", "Database Engines/Servers",
-                              "Topic :: Database :: Database Engines/Servers", True))
+                               "Topic :: Database :: Database Engines/Servers", True))
         self.create_trove_cat(
             (43, 18, "security", "Security", "Topic :: Security", True))
         self.create_trove_cat(
@@ -1069,23 +1098,24 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (55, 18, "desktop", "Desktop Environment", "Topic :: Desktop Environment", True))
         self.create_trove_cat((56, 55, "windowmanagers", "Window Managers",
-                              "Topic :: Desktop Environment :: Window Managers", True))
+                               "Topic :: Desktop Environment :: Window Managers", True))
         self.create_trove_cat((59, 56, "enlightenment", "Enlightenment",
-                              "Topic :: Desktop Environment :: Window Managers :: Enlightenment", True))
+                               "Topic :: Desktop Environment :: Window Managers :: Enlightenment", True))
         self.create_trove_cat(
-            (60, 59, "themes", "Themes", "Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes", True))
+            (60, 59, "themes", "Themes", "Topic :: Desktop Environment :: Window Managers :: Enlightenment :: Themes",
+             True))
         self.create_trove_cat((57, 55, "kde", "K Desktop Environment (KDE)",
-                              "Topic :: Desktop Environment :: K Desktop Environment (KDE)", True))
+                               "Topic :: Desktop Environment :: K Desktop Environment (KDE)", True))
         self.create_trove_cat(
             (61, 57, "themes", "Themes", "Topic :: Desktop Environment :: K Desktop Environment (KDE) :: Themes", True))
         self.create_trove_cat(
             (58, 55, "gnome", "Gnome", "Topic :: Desktop Environment :: Gnome", True))
         self.create_trove_cat((62, 55, "screensavers", "Screen Savers",
-                              "Topic :: Desktop Environment :: Screen Savers", True))
+                               "Topic :: Desktop Environment :: Screen Savers", True))
         self.create_trove_cat(
             (80, 18, "games", "Games/Entertainment", "Topic :: Games/Entertainment", True))
         self.create_trove_cat((633, 80, "console-games", "Console-based Games",
-                              "Topic :: Games/Entertainment :: Console-based Games", True))
+                               "Topic :: Games/Entertainment :: Console-based Games", True))
         self.create_trove_cat(
             (287, 80, "boardgames", "Board Games", "Topic :: Games/Entertainment :: Board Games", True))
         self.create_trove_cat(
@@ -1105,13 +1135,13 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (85, 80, "simulation", "Simulation", "Topic :: Games/Entertainment :: Simulation", True))
         self.create_trove_cat((86, 80, "mud", "Multi-User Dungeons (MUD)",
-                              "Topic :: Games/Entertainment :: Multi-User Dungeons (MUD)", True))
+                               "Topic :: Games/Entertainment :: Multi-User Dungeons (MUD)", True))
         self.create_trove_cat(
             (268, 80, "Puzzles", "Puzzle Games", "Topic :: Games/Entertainment :: Puzzle Games", True))
         self.create_trove_cat(
             (88, 87, "finger", "Finger", "Topic :: Internet :: Finger", True))
         self.create_trove_cat((89, 87, "ftp", "File Transfer Protocol (FTP)",
-                              "Topic :: Internet :: File Transfer Protocol (FTP)", True))
+                               "Topic :: Internet :: File Transfer Protocol (FTP)", True))
         self.create_trove_cat(
             (270, 87, "WAP", "WAP", "Topic :: Internet :: WAP", True))
         self.create_trove_cat(
@@ -1119,21 +1149,21 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (91, 90, "browsers", "Browsers", "Topic :: Internet :: WWW/HTTP :: Browsers", True))
         self.create_trove_cat((92, 90, "dynamic", "Dynamic Content",
-                              "Topic :: Internet :: WWW/HTTP :: Dynamic Content", True))
+                               "Topic :: Internet :: WWW/HTTP :: Dynamic Content", True))
         self.create_trove_cat((95, 92, "messageboards", "Message Boards",
-                              "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards", True))
+                               "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards", True))
         self.create_trove_cat((96, 92, "cgi", "CGI Tools/Libraries",
-                              "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries", True))
+                               "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries", True))
         self.create_trove_cat((94, 92, "counters", "Page Counters",
-                              "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters", True))
+                               "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters", True))
         self.create_trove_cat((93, 90, "indexing", "Indexing/Search",
-                              "Topic :: Internet :: WWW/HTTP :: Indexing/Search", True))
+                               "Topic :: Internet :: WWW/HTTP :: Indexing/Search", True))
         self.create_trove_cat((243, 90, "sitemanagement", "Site Management",
-                              "Topic :: Internet :: WWW/HTTP :: Site Management", True))
+                               "Topic :: Internet :: WWW/HTTP :: Site Management", True))
         self.create_trove_cat((244, 243, "linkchecking", "Link Checking",
-                              "Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking", True))
+                               "Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking", True))
         self.create_trove_cat((250, 90, "httpservers", "HTTP Servers",
-                              "Topic :: Internet :: WWW/HTTP :: HTTP Servers", True))
+                               "Topic :: Internet :: WWW/HTTP :: HTTP Servers", True))
         self.create_trove_cat(
             (149, 87, "dns", "Name Service (DNS)", "Topic :: Internet :: Name Service (DNS)", True))
         self.create_trove_cat(
@@ -1154,19 +1184,19 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (606, 45, "frameworks", "Frameworks", "Topic :: Software Development :: Frameworks", True))
         self.create_trove_cat((564, 45, "documentation", "Documentation",
-                              "Topic :: Software Development :: Documentation", True))
+                               "Topic :: Software Development :: Documentation", True))
         self.create_trove_cat((562, 45, "swdev_oo", "Object Oriented",
-                              "Topic :: Software Development :: Object Oriented", True))
+                               "Topic :: Software Development :: Object Oriented", True))
         self.create_trove_cat((409, 45, "l10n", "L10N (Localization)",
-                              "Topic :: Software Development :: L10N (Localization)", True))
+                               "Topic :: Software Development :: L10N (Localization)", True))
         self.create_trove_cat((408, 45, "i18n", "I18N (Internationalization)",
-                              "Topic :: Software Development :: I18N (Internationalization)", True))
+                               "Topic :: Software Development :: I18N (Internationalization)", True))
         self.create_trove_cat((50, 45, "objectbrokering", "Object Brokering",
-                              "Topic :: Software Development :: Object Brokering", True))
+                               "Topic :: Software Development :: Object Brokering", True))
         self.create_trove_cat(
             (51, 50, "corba", "CORBA", "Topic :: Software Development :: Object Brokering :: CORBA", True))
         self.create_trove_cat((52, 45, "versioncontrol", "Version Control",
-                              "Topic :: Software Development :: Version Control", True))
+                               "Topic :: Software Development :: Version Control", True))
         self.create_trove_cat(
             (53, 52, "cvs", "CVS", "Topic :: Software Development :: Version Control :: CVS", True))
         self.create_trove_cat(
@@ -1174,15 +1204,15 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (260, 52, "SCCS", "SCCS", "Topic :: Software Development :: Version Control :: SCCS", True))
         self.create_trove_cat((259, 45, "codegen", "Code Generators",
-                              "Topic :: Software Development :: Code Generators", True))
+                               "Topic :: Software Development :: Code Generators", True))
         self.create_trove_cat(
             (47, 45, "debuggers", "Debuggers", "Topic :: Software Development :: Debuggers", True))
         self.create_trove_cat(
             (48, 45, "compilers", "Compilers", "Topic :: Software Development :: Compilers", True))
         self.create_trove_cat((49, 45, "interpreters", "Interpreters",
-                              "Topic :: Software Development :: Interpreters", True))
+                               "Topic :: Software Development :: Interpreters", True))
         self.create_trove_cat((561, 45, "softwaredev_ui", "User Interfaces",
-                              "Topic :: Software Development :: User Interfaces", True))
+                               "Topic :: Software Development :: User Interfaces", True))
         self.create_trove_cat(
             (565, 45, "quality_assurance", "Quality Assurance",
              "Topic :: Software Development :: Quality Assurance", True))
@@ -1191,11 +1221,11 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (582, 45, "design", "Design", "Topic :: Software Development :: Design", True))
         self.create_trove_cat((593, 45, "cross_compilers", "Cross Compilers",
-                              "Topic :: Software Development :: Cross Compilers", True))
+                               "Topic :: Software Development :: Cross Compilers", True))
         self.create_trove_cat(
             (603, 45, "profilers", "Profiling", "Topic :: Software Development :: Profiling", True))
         self.create_trove_cat((610, 45, "virtual_machines", "Virtual Machines",
-                              "Topic :: Software Development :: Virtual Machines", True))
+                               "Topic :: Software Development :: Virtual Machines", True))
         self.create_trove_cat(
             (619, 45, "usability", "Usability", "Topic :: Software Development :: Usability", True))
         self.create_trove_cat(
@@ -1214,11 +1244,11 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (638, 136, "storage", "Storage", "Topic :: System :: Storage", True))
         self.create_trove_cat((601, 638, "file_management", "File Management",
-                              "Topic :: System :: Storage :: File Management", True))
+                               "Topic :: System :: Storage :: File Management", True))
         self.create_trove_cat(
             (19, 638, "archiving", "Archiving", "Topic :: System :: Storage :: Archiving", True))
         self.create_trove_cat((42, 19, "compression", "Compression",
-                              "Topic :: System :: Storage :: Archiving :: Compression", True))
+                               "Topic :: System :: Storage :: Archiving :: Compression", True))
         self.create_trove_cat(
             (137, 19, "backup", "Backup", "Topic :: System :: Storage :: Archiving :: Backup", True))
         self.create_trove_cat(
@@ -1240,9 +1270,11 @@ class CreateTroveCategoriesCommand(base.Command):
             (289, 253, "authentication", "Authentication/Directory",
              "Topic :: System :: Systems Administration :: Authentication/Directory", True))
         self.create_trove_cat(
-            (290, 289, "nis", "NIS", "Topic :: System :: Systems Administration :: Authentication/Directory :: NIS", True))
+            (290, 289, "nis", "NIS", "Topic :: System :: Systems Administration :: Authentication/Directory :: NIS",
+             True))
         self.create_trove_cat(
-            (291, 289, "ldap", "LDAP", "Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP", True))
+            (291, 289, "ldap", "LDAP", "Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP",
+             True))
         self.create_trove_cat(
             (153, 136, "power", "Power (UPS)", "Topic :: System :: Power (UPS)", True))
         self.create_trove_cat(
@@ -1254,13 +1286,13 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (152, 150, "monitoring", "Monitoring", "Topic :: System :: Networking :: Monitoring", True))
         self.create_trove_cat((155, 152, "watchdog", "Hardware Watchdog",
-                              "Topic :: System :: Networking :: Monitoring :: Hardware Watchdog", True))
+                               "Topic :: System :: Networking :: Monitoring :: Hardware Watchdog", True))
         self.create_trove_cat(
             (148, 136, "logging", "Logging", "Topic :: System :: Logging", True))
         self.create_trove_cat(
             (592, 148, "log_rotation", "Log Rotation", "Topic :: System :: Logging :: Log Rotation", True))
         self.create_trove_cat((144, 136, "kernels", "Operating System Kernels",
-                              "Topic :: System :: Operating System Kernels", True))
+                               "Topic :: System :: Operating System Kernels", True))
         self.create_trove_cat(
             (145, 144, "bsd", "BSD", "Topic :: System :: Operating System Kernels :: BSD", True))
         self.create_trove_cat(
@@ -1274,9 +1306,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (313, 146, "mainframe", "Mainframes", "Topic :: System :: Hardware :: Mainframes", True))
         self.create_trove_cat((312, 146, "smp", "Symmetric Multi-processing",
-                              "Topic :: System :: Hardware :: Symmetric Multi-processing", True))
+                               "Topic :: System :: Hardware :: Symmetric Multi-processing", True))
         self.create_trove_cat((292, 146, "drivers", "Hardware Drivers",
-                              "Topic :: System :: Hardware :: Hardware Drivers", True))
+                               "Topic :: System :: Hardware :: Hardware Drivers", True))
         self.create_trove_cat(
             (138, 136, "benchmark", "Benchmark", "Topic :: System :: Benchmark", True))
         self.create_trove_cat(
@@ -1286,7 +1318,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (141, 136, "clustering", "Clustering", "Topic :: System :: Clustering", True))
         self.create_trove_cat((308, 136, "distributed_computing",
-                              "Distributed Computing", "Topic :: System :: Distributed Computing", True))
+                               "Distributed Computing", "Topic :: System :: Distributed Computing", True))
         self.create_trove_cat(
             (142, 136, "filesystems", "Filesystems", "Topic :: System :: Filesystems", True))
         self.create_trove_cat(
@@ -1294,9 +1326,9 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (87, 18, "internet", "Internet", "Topic :: Internet", True))
         self.create_trove_cat((118, 116, "cdripping", "CD Ripping",
-                              "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping", True))
+                               "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping", True))
         self.create_trove_cat((119, 113, "conversion", "Conversion",
-                              "Topic :: Multimedia :: Sound/Audio :: Conversion", True))
+                               "Topic :: Multimedia :: Sound/Audio :: Conversion", True))
         self.create_trove_cat(
             (120, 113, "editors", "Editors", "Topic :: Multimedia :: Sound/Audio :: Editors", True))
         self.create_trove_cat(
@@ -1304,29 +1336,29 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (100, 99, "graphics", "Graphics", "Topic :: Multimedia :: Graphics", True))
         self.create_trove_cat((109, 100, "3dmodeling", "3D Modeling",
-                              "Topic :: Multimedia :: Graphics :: 3D Modeling", True))
+                               "Topic :: Multimedia :: Graphics :: 3D Modeling", True))
         self.create_trove_cat((110, 100, "3drendering", "3D Rendering",
-                              "Topic :: Multimedia :: Graphics :: 3D Rendering", True))
+                               "Topic :: Multimedia :: Graphics :: 3D Rendering", True))
         self.create_trove_cat((111, 100, "presentation", "Presentation",
-                              "Topic :: Multimedia :: Graphics :: Presentation", True))
+                               "Topic :: Multimedia :: Graphics :: Presentation", True))
         self.create_trove_cat(
             (112, 100, "viewers", "Viewers", "Topic :: Multimedia :: Graphics :: Viewers", True))
         self.create_trove_cat(
             (101, 100, "capture", "Capture", "Topic :: Multimedia :: Graphics :: Capture", True))
         self.create_trove_cat((104, 101, "screencapture", "Screen Capture",
-                              "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture", True))
+                               "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture", True))
         self.create_trove_cat((103, 101, "cameras", "Digital Camera",
-                              "Topic :: Multimedia :: Graphics :: Capture :: Digital Camera", True))
+                               "Topic :: Multimedia :: Graphics :: Capture :: Digital Camera", True))
         self.create_trove_cat((102, 101, "scanners", "Scanners",
-                              "Topic :: Multimedia :: Graphics :: Capture :: Scanners", True))
+                               "Topic :: Multimedia :: Graphics :: Capture :: Scanners", True))
         self.create_trove_cat((105, 100, "conversion", "Graphics Conversion",
-                              "Topic :: Multimedia :: Graphics :: Graphics Conversion", True))
+                               "Topic :: Multimedia :: Graphics :: Graphics Conversion", True))
         self.create_trove_cat(
             (106, 100, "editors", "Editors", "Topic :: Multimedia :: Graphics :: Editors", True))
         self.create_trove_cat((108, 106, "raster", "Raster-Based",
-                              "Topic :: Multimedia :: Graphics :: Editors :: Raster-Based", True))
+                               "Topic :: Multimedia :: Graphics :: Editors :: Raster-Based", True))
         self.create_trove_cat((107, 106, "vector", "Vector-Based",
-                              "Topic :: Multimedia :: Graphics :: Editors :: Vector-Based", True))
+                               "Topic :: Multimedia :: Graphics :: Editors :: Vector-Based", True))
         self.create_trove_cat(
             (97, 18, "scientific", "Scientific/Engineering", "Topic :: Scientific/Engineering", True))
         self.create_trove_cat(
@@ -1335,7 +1367,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (602, 97, "robotics", "Robotics", "Topic :: Scientific/Engineering :: Robotics", True))
         self.create_trove_cat((600, 97, "simulations", "Simulations",
-                              "Topic :: Scientific/Engineering :: Simulations", True))
+                               "Topic :: Scientific/Engineering :: Simulations", True))
         self.create_trove_cat(
             (568, 97, "ecosystem_sciences", "Ecosystem Sciences",
              "Topic :: Scientific/Engineering :: Ecosystem Sciences", True))
@@ -1345,25 +1377,25 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (384, 97, "chemistry", "Chemistry", "Topic :: Scientific/Engineering :: Chemistry", True))
         self.create_trove_cat((252, 97, "bioinformatics", "Bio-Informatics",
-                              "Topic :: Scientific/Engineering :: Bio-Informatics", True))
+                               "Topic :: Scientific/Engineering :: Bio-Informatics", True))
         self.create_trove_cat(
             (246, 97, "eda", "Electronic Design Automation (EDA)",
              "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)", True))
         self.create_trove_cat((135, 97, "visualization", "Visualization",
-                              "Topic :: Scientific/Engineering :: Visualization", True))
+                               "Topic :: Scientific/Engineering :: Visualization", True))
         self.create_trove_cat(
             (134, 97, "astronomy", "Astronomy", "Topic :: Scientific/Engineering :: Astronomy", True))
         self.create_trove_cat((133, 97, "ai", "Artificial Intelligence",
-                              "Topic :: Scientific/Engineering :: Artificial Intelligence", True))
+                               "Topic :: Scientific/Engineering :: Artificial Intelligence", True))
         self.create_trove_cat(
             (591, 133, "intelligent_agents", "Intelligent Agents",
              "Topic :: Scientific/Engineering :: Artificial Intelligence :: Intelligent Agents", True))
         self.create_trove_cat((98, 97, "mathematics", "Mathematics",
-                              "Topic :: Scientific/Engineering :: Mathematics", True))
+                               "Topic :: Scientific/Engineering :: Mathematics", True))
         self.create_trove_cat((272, 97, "HMI", "Human Machine Interfaces",
-                              "Topic :: Scientific/Engineering :: Human Machine Interfaces", True))
+                               "Topic :: Scientific/Engineering :: Human Machine Interfaces", True))
         self.create_trove_cat((266, 97, "medical", "Medical Science Apps.",
-                              "Topic :: Scientific/Engineering :: Medical Science Apps.", True))
+                               "Topic :: Scientific/Engineering :: Medical Science Apps.", True))
         self.create_trove_cat(
             (383, 97, "gis", "GIS", "Topic :: Scientific/Engineering :: GIS", True))
         self.create_trove_cat(
@@ -1372,7 +1404,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (387, 97, "physics", "Physics", "Topic :: Scientific/Engineering :: Physics", True))
         self.create_trove_cat((567, 97, "earth_science", "Earth Sciences",
-                              "Topic :: Scientific/Engineering :: Earth Sciences", True))
+                               "Topic :: Scientific/Engineering :: Earth Sciences", True))
         self.create_trove_cat(
             (282, 18, "Sociology", "Sociology", "Topic :: Sociology", True))
         self.create_trove_cat(
@@ -1390,7 +1422,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (125, 99, "video", "Video", "Topic :: Multimedia :: Video", True))
         self.create_trove_cat((594, 125, "still_capture", "Still Capture",
-                              "Topic :: Multimedia :: Video :: Still Capture", True))
+                               "Topic :: Multimedia :: Video :: Still Capture", True))
         self.create_trove_cat(
             (596, 125, "codec", "Codec", "Topic :: Multimedia :: Video :: Codec", True))
         self.create_trove_cat(
@@ -1401,12 +1433,12 @@ class CreateTroveCategoriesCommand(base.Command):
             (256, 125, "nonlineareditor", "Non-Linear Editor",
              "Topic :: Multimedia :: Video :: Non-Linear Editor", True))
         self.create_trove_cat((595, 125, "special_effects", "Special Effects",
-                              "Topic :: Multimedia :: Video :: Special Effects", True))
+                               "Topic :: Multimedia :: Video :: Special Effects", True))
         self.create_trove_cat(
             (623, 125, "video_realtime", "Realtime Processing",
              "Topic :: Multimedia :: Video :: Realtime Processing", True))
         self.create_trove_cat((126, 125, "vidcapture", "Video Capture",
-                              "Topic :: Multimedia :: Video :: Video Capture", True))
+                               "Topic :: Multimedia :: Video :: Video Capture", True))
         self.create_trove_cat(
             (113, 99, "sound", "Sound/Audio", "Topic :: Multimedia :: Sound/Audio", True))
         self.create_trove_cat(
@@ -1416,41 +1448,44 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (114, 113, "analysis", "Analysis", "Topic :: Multimedia :: Sound/Audio :: Analysis", True))
         self.create_trove_cat((115, 113, "capture", "Capture/Recording",
-                              "Topic :: Multimedia :: Sound/Audio :: Capture/Recording", True))
+                               "Topic :: Multimedia :: Sound/Audio :: Capture/Recording", True))
         self.create_trove_cat(
             (248, 113, "midi", "MIDI", "Topic :: Multimedia :: Sound/Audio :: MIDI", True))
         self.create_trove_cat((249, 113, "synthesis", "Sound Synthesis",
-                              "Topic :: Multimedia :: Sound/Audio :: Sound Synthesis", True))
+                               "Topic :: Multimedia :: Sound/Audio :: Sound Synthesis", True))
         self.create_trove_cat(
             (116, 113, "cdaudio", "CD Audio", "Topic :: Multimedia :: Sound/Audio :: CD Audio", True))
         self.create_trove_cat((117, 116, "cdplay", "CD Playing",
-                              "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Playing", True))
+                               "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Playing", True))
         self.create_trove_cat(
             (99, 18, "multimedia", "Multimedia", "Topic :: Multimedia", True))
         self.create_trove_cat((670, 14, "agpl", "Affero GNU Public License",
-                              "License :: OSI-Approved Open Source :: Affero GNU Public License", True))
+                               "License :: OSI-Approved Open Source :: Affero GNU Public License", True))
         self.create_trove_cat((862, 14, "lppl", "LaTeX Project Public License",
-                              "License :: OSI-Approved Open Source :: LaTeX Project Public License", True))
+                               "License :: OSI-Approved Open Source :: LaTeX Project Public License", True))
         self.create_trove_cat((655, 432, "win64", "64-bit MS Windows",
-                              "Operating System :: Grouping and Descriptive Categories :: 64-bit MS Windows", True))
+                               "Operating System :: Grouping and Descriptive Categories :: 64-bit MS Windows", True))
         self.create_trove_cat(
-            (657, 418, "vista", "Vista", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Vista", True))
+            (657, 418, "vista", "Vista",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Vista", True))
         self.create_trove_cat(
-            (851, 418, "win7", "Windows 7", "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Windows 7", True))
+            (851, 418, "win7", "Windows 7",
+             "Operating System :: Modern (Vendor-Supported) Desktop Operating Systems :: Windows 7", True))
         self.create_trove_cat(
-            (728, 315, "android", "Android", "Operating System :: Handheld/Embedded Operating Systems :: Android", True))
+            (
+            728, 315, "android", "Android", "Operating System :: Handheld/Embedded Operating Systems :: Android", True))
         self.create_trove_cat((780, 315, "ios", "Apple iPhone",
-                              "Operating System :: Handheld/Embedded Operating Systems :: Apple iPhone", True))
+                               "Operating System :: Handheld/Embedded Operating Systems :: Apple iPhone", True))
         self.create_trove_cat((863, 534, "architects", "Architects",
-                              "Intended Audience :: by End-User Class :: Architects", False))
+                               "Intended Audience :: by End-User Class :: Architects", False))
         self.create_trove_cat(
             (864, 534, "auditors", "Auditors", "Intended Audience :: by End-User Class :: Auditors", False))
         self.create_trove_cat(
             (865, 534, "testers", "Testers", "Intended Audience :: by End-User Class :: Testers", False))
         self.create_trove_cat((866, 534, "secpros", "Security Professionals",
-                              "Intended Audience :: by End-User Class :: Security Professionals", False))
+                               "Intended Audience :: by End-User Class :: Security Professionals", False))
         self.create_trove_cat((867, 535, "secindustry", "Security",
-                              "Intended Audience :: by Industry or Sector :: Security", False))
+                               "Intended Audience :: by Industry or Sector :: Security", False))
         session(M.TroveCategory).flush()
 
         for name in self.migrations:
@@ -1466,7 +1501,7 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (641, 576, "workflow", "Workflow", "Topic :: Office/Business :: Enterprise :: Workflow"))
         self.create_trove_cat((642, 292, "linuxdrivers", "Linux",
-                              "Topic :: System :: Hardware :: Hardware Drivers :: Linux"))
+                               "Topic :: System :: Hardware :: Hardware Drivers :: Linux"))
         self.create_trove_cat(
             (643, 582, "uml", "UML", "Topic :: Software Development :: Design :: UML"))
         self.create_trove_cat(
@@ -1474,23 +1509,23 @@ class CreateTroveCategoriesCommand(base.Command):
         self.create_trove_cat(
             (645, 92, "blogging", "Blogging", "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Blogging"))
         self.create_trove_cat((646, 52, "subversion", "Subversion",
-                              "Topic :: Software Development :: Version Control :: Subversion"))
+                               "Topic :: Software Development :: Version Control :: Subversion"))
         self.create_trove_cat((647, 612, "webservices", "Web Services",
-                              "Topic :: Formats and P

<TRUNCATED>