Merge pull request #2697 from qwcode/refactor_req_file

Refactor requirements file parsing

Author: qwcode

pip/cmdoptions.py

@@ -434,6 +434,16 @@ def editable():
     help="Don't periodically check PyPI to determine whether a new version "
          "of pip is available for download. Implied with --no-index.")
 
+# Deprecated, Remove later
+always_unzip = partial(
+    Option,
+    '-Z', '--always-unzip',
+    dest='always_unzip',
+    action='store_true',
+    help=SUPPRESS_HELP,
+)
+
+
 ##########
 # groups #
 ##########

pip/exceptions.py

@@ -18,9 +18,17 @@ class DistributionNotFound(InstallationError):
     """Raised when a distribution cannot be found to satisfy a requirement"""
 
 
-class RequirementsFileParseError(PipError):
-    """Raised when an invalid state is encountered during requirement file
-    parsing."""
+class RequirementsFileParseError(InstallationError):
+    """Raised when a general error occurs parsing a requirements file line."""
+
+
+class ReqFileOnleOneOptionPerLineError(InstallationError):
+    """Raised when an option is not allowed in a requirements file."""
+
+
+class ReqFileOptionNotAllowedWithReqError(InstallationError):
+    """Raised when an option is not allowed on a requirement line in a requirements
+       file."""
 
 
 class BestVersionAlreadyInstalled(PipError):